diff --git a/Manifest b/Manifest
index 311b03bf2df6..101c627591e3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29314 BLAKE2B ef2b5757f442ebe5f36b409b123985985600900c48890a842596431d86bc494910eb361aa291217a27eb852cd14c03054e41d81226efd7546f30e5c5dcd9a5ba SHA512 fe961b1db91e4ec5db1118b65cfc361ed33bf5729d52c1fd6ada815dbb0d4fbfab15401d2d3c9cbadb8f66f619b5fa51fd4eedd0520f8e47093457ec37a65702
-TIMESTAMP 2019-04-10T08:08:46Z
+MANIFEST Manifest.files.gz 29315 BLAKE2B e990b28f6870a38379306645a07a7b34596849a75a074755d71d56fd69d8c461828e86c27b840ba241f62a2ff07a8c84db5e7fdc45542cbf091665e9ea4780d5 SHA512 35ed29054a42be4eae0e919053d6767a753cac43dad0accbf588349576be4c750063408ac529e95da6b5c4e9ab053c6486fd84feb0ab0f1c34faa845fbc2154e
+TIMESTAMP 2019-04-11T21:08:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlytpI5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlyvrN9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAjiBAAnMNzkbvmfI/7zTquXDWIkkTKjlgrFQuAeJRvhqcytrC9MF0v+fixlcyg
-rWodw2qm5+gonmX+i4KKrUJWyoYu2L/8eb2qHo5xGDkR65FaIL6O7VpUrZIuEiSw
-yy5UtwVv70/XcslVY+H2A1v7Wy03O5kQy7Rp5BWjd7hIEWgUDueykFZPjCz1w+mP
-3gAjZxbp+9YG7oBZGb0R86h8EHyVA35nssdRSNNu2YWdzjqYSB1r3ZiCL8faPO1k
-HZs9TOEJKHmfBETZhl2vPBWfhhpQOG7Aycw912PUi5EJb2m1pmZA6y5Gbwwk0jPt
-EWez17f0qDkbQqg4+aTRBdaQf4OMXEgk8a/ROwIIWfT1Sx1sBFOsdVZNFi3KgoUa
-a3PgaBNKXXQU/kgy3st9hfsx1LXgvvQW+MP5memiNufxecQo/dDNaqnO1K4rWnfE
-KPG8xdwfwjj1kis81UyrKw1skuBvrSzGYDpACAIjNycUxf40tJqTI4HYvyj/pLP9
-5QcWBdv7/4EVuupzkj1mCaH+zMyQA+uY+LNIMVaJiLBYREvjgRcv8KtgMZQLsQ05
-oep3u2b5VYfqTZqDjDqoMw8V/bOk0IaX6k1MY0GfdbU1BtL1f2zPWLT2dcOS89Hc
-O9iIKbaXoZwpoTkOt33CUp0lsPNcIq+fUg8hF+sNyolvmsoZ2HI=
-=Q3ng
+klByrg//RfUqtid+kAEgO8JwPWN/1iJiOeUXH5+qUQgkQdrcM9xakyX2753JcNUj
+jI2b522jPYrDAxaeOHav6MkFPMTWxBY/nhXM/NoCfrgcz9ORVP2adW2S/JNnj5fa
+YD2v/Hwrv4bHm9cgE8Q7Te5vyhKzqgB5npYmnXA9IJJr+oT0hITTwgA4wpNxunYv
+azNrD5Wk9EDmdUanHN04NeoLKhkDYroTuBrP+8B1gLDEueRufkdc4O+PeH1rhASc
+FD1+hnUX0yOScp06kU9xh5eA7iAd75z+p0ja6KeumaBeqhE9q9WIH+ujBIX11OlB
+kFJV1gBkD5G5HbcYEOg+Qav2pwmo3IKl0un268OaXXqnh7Vlo5n9/sJgx1MdGley
+Nx8hNdQSWVzQ3wctm2O+u68CIb7z9HuBdpp82LbZJLEDD+zEII9qDcMsdYGR+wjo
+Xlvg8gji50nzD+MPpdUA4NlXMr0cyghNwfcNZo329svEcv6a8KdV35ptJGszHcPT
+4dIAahyixTDG4QNKZZt3emYB3fJxa0yNMEcpqrEz/xRIsZB5py8Cl+ao8xL9QWgj
+r18fwsOFe3dv//R7jSefhgQn5g4SVZhgNfKrVQ67WpEXRSgQE5z5d9BfHMc2FMr3
+X9nl0W2bGAleYoTxwp6NA3mmC1+LJUP6wbqjwaxuqqgKwnLALJU=
+=JYiw
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a42232de5f4c..85e4a5046bcd 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cfe880156181..98c6c4ae798a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index f33054db33de..86a1c92ddf2b 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -6,4 +6,4 @@ EBUILD dxf-7.3.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6b
 EBUILD dxf-7.4.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
 EBUILD dxf-7.4.1.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
 EBUILD dxf-7.5.0.ebuild 726 BLAKE2B fb23ab46f823bb55d325c1e3a8681608e4fc6413578016aebe40afdef3b8fd9648778872ffc5c9b81d841145bfd10ee22105b7c631f5eea7afdaaa0d8700c4e1 SHA512 5a43d7ef441917193a8e1bf59fe0d3352c9c1ca6ffe4d86569720685513a6f89270c3e243ff37d25ceadd1bfb0c826cbe78fe1ee12590905a641776ba4accd87
-MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
+MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/metadata.xml b/app-admin/dxf/metadata.xml
index 3dbf29ff0e73..5fa3dcb6838a 100644
--- a/app-admin/dxf/metadata.xml
+++ b/app-admin/dxf/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">python-dxf</remote-id>
 		<remote-id type="github">davedoesdev/dxf</remote-id>
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index d599d13a7e1c..7269c71ac131 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,6 +1,8 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-17.0.0.tar.gz 1961137 BLAKE2B ff649ce366739320bcc5073cb60cc24ab09e098bd6808374007f89808d6caf020a77f711a714b34f8a1ef5b0754220aab7c35c02fbdc0d3d0f44e24185a8cdc4 SHA512 cd10bd2d3e98ab1a80ec4f09b5954dbc334079a36d3dfc0d27c5a4f40e5920e0a6fb91c0fc5430c9e625a375e44a8d886568f2a712190dc0f80df10b4998e9af
+DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146dd55103ea44c5f2cc96990dde0d2cf6bdf785913b5712dc0dda4a79ff0a2cf9bac1a58f5195fe5f5cc22116cae6 SHA512 79129c6ee1cce0fec0c5e656a97278ae275aa8ba33690ac62959f317c4e6b2f548ab0c97f0905dcda2500594acb3f5c05644064bdd3cccb443c593513522d274
 EBUILD glance-17.0.0.ebuild 4935 BLAKE2B 06082f3229cf0c8f1af11de8481734748fc783130567e14a19f6bce50b5aceeef6baffe378251ba0591cabfb701906de6ebff5524deb67c6767f3849ab28e829 SHA512 75bad0550a099f7b404dc364c5b01c7190d9c64392414b42f7a50de475959c99f9557aec951c435f59870aae1621c5d6b4f529042b18aa3a2ef7936e47454d0e
+EBUILD glance-18.0.0.ebuild 5068 BLAKE2B c330360d9683189e8aa025e973bef6f5dbc62ee9f7dcc589b4821efdae4a7a45e42654649f2fba70246d75d64ce63a04f39e9c0481e1679a69322e51740a6b23 SHA512 0c4bab3c4ad64ab7800bc8afbc65a6338e959a57452270bb267239d50d816e27911dbbd6c49e66181e9ddf24ce72c1c266108f7c1e4eaf65be7e657d7bf3c353
 EBUILD glance-2018.2.9999.ebuild 4940 BLAKE2B 5fc2e5aee453fb29c78f196870208abbde718bbe2a7e33a513aacc121317430b82370a683d5bcad57b2400aff6cf9e973d4f6a956df67f33784035ff78897e07 SHA512 81178ab2a70ce97fba1e3baa4c63f09f0d5898a4057ad428c536b4b8c20daee16eb4698a44276bc23b71a5d20604415435cacb5e0558a53add156b29894be711
 EBUILD glance-2019.1.9999.ebuild 5068 BLAKE2B c330360d9683189e8aa025e973bef6f5dbc62ee9f7dcc589b4821efdae4a7a45e42654649f2fba70246d75d64ce63a04f39e9c0481e1679a69322e51740a6b23 SHA512 0c4bab3c4ad64ab7800bc8afbc65a6338e959a57452270bb267239d50d816e27911dbbd6c49e66181e9ddf24ce72c1c266108f7c1e4eaf65be7e657d7bf3c353
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-18.0.0.ebuild b/app-admin/glance/glance-18.0.0.ebuild
new file mode 100644
index 000000000000..cb013c6eed6b
--- /dev/null
+++ b/app-admin/glance/glance-18.0.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.26.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	rm -r ${ED}/usr/etc
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 03bf85d0bf9c..f71eac8bcdac 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,11 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
 AUX keepassxc-2.4.0-build_fix.patch 1419 BLAKE2B b5661c75008c9031598ee704b21e0581a6e3859addb9b4e642cca415b06f26cb7e6a984fb942f648f7d4082c17e198644230ddf711696971df6754cf4c6eb119 SHA512 3e659b5048089528c2055f9481119e66f655b2531a4347d4ca6e439bcc82566f2e658bdf4442e6c678d19811ca494533e7ce08e14dab3148c841084f2f5ab898
+AUX keepassxc-2.4.0-update_checker_toggle.patch 18616 BLAKE2B 5b13c5ab493b955dc31e7f928c471ec11095f26a2d2f76a5145318e0e35dc751187eae11f9467a78c0455ae8ab0a6a0045c6b4670a701f13e56910ac1b484808 SHA512 138f0de9bd862423a4764fcc61c133ef98d800ce6ab3cde0fe304352866266bbd8d8acd8dabd131e8189e8cbc551f92464f03c199f9f02861534c17b30a94ea2
 AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
 DIST keepassxc-2.4.0-src.tar.xz 3252104 BLAKE2B 7c82822f6fb0eaf6b5d086aebdf4927af215339f92e7f52104e05d5ff301461a1ad816d8a39b377c717e975001c9295ec6d8b2f2003a2215c05931eb9acb5c73 SHA512 b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559
 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
+EBUILD keepassxc-2.4.0-r1.ebuild 2163 BLAKE2B 5dd1a135a8c3eb1dbebbf9424f85955449196bd86bfbf9c6fe00a07fc5d166158d9c75c1dab87c611fe4f3420133976d5e5f25517677f74148ac09571906d9c5 SHA512 e77ea5b046d744c59d3d1cb6fa9328697eae8c9a6a0a0acdc13990f6871b74484fe9f69c9b3a62b575d170b0df756c7db631c4804228e29d9445308291817129
 EBUILD keepassxc-2.4.0.ebuild 2087 BLAKE2B 95aa54e8b74d315affb3300c0384faeea4861b79fdf52037c15b1c2beb3da15a9de9bd58f70debdd21f3bd5417ccadb5b8d001787a253f482c6e0edae58afd68 SHA512 9e97dbc7d7182a3d1ad53de47403baf7b0026271241e936d60039238869faf0b6b48fe1d463f2effb45498d822067352e2bc238efaad4260e1996ec9ac9750fd
 EBUILD keepassxc-9999.ebuild 1995 BLAKE2B 6b883c1cc942e330d437707367e9e6e416432ac5c932360fb561eac3ff4af72e70b50ea58084aad0082255d0f1528168e96ac8e9faff96fcea8814760f4893c8 SHA512 75d6f738836de30ace55d71c8d69b0bb4837542be721fb4663bfaef595f1b0d7c8d15bf1211549c2219f98ec45c49e2ddec772956d0347a470dd3ef55b8b5bd1
 MISC metadata.xml 891 BLAKE2B 0c279d26b8f00d816d92a8fdd428629cf92a0ee7c0789ac60c9b5ea9b491dbd495a09815785fa99427ae8f5701dff0da8a06065059b1a6f05f1cdadbdde88192 SHA512 ec6fe12b1b508784947b55bb562a9e99632481ce06289b4dd7325f0834789fa4df99a15792ab7e91bab169c89a0a5a4c99ccd3372f1a2ff84cece49c4acd1779
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
new file mode 100644
index 000000000000..64e02066916b
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
@@ -0,0 +1,445 @@
+From 28994fef0d2c04690490f34b5da87c42e60a6b5e Mon Sep 17 00:00:00 2001
+From: Jonathan White <support@dmapps.us>
+Date: Tue, 9 Apr 2019 21:06:13 -0400
+Subject: [PATCH] Enhance update checker
+
+* Reduce initial update check notification to 500 ms to prevent inappropriately stealing focus from user
+* Add build flag WITH_XC_UPDATECHECK which defaults to ON
+* Update checks are resolved every 7 days instead of every time the application is started
+* Better checks for beta builds; ignore snapshots
+* Increase test cases
+---
+ CMakeLists.txt                              |  5 ++
+ src/CMakeLists.txt                          |  1 +
+ src/config-keepassx.h.cmake                 |  1 +
+ src/core/Clock.cpp                          |  1 +
+ src/gui/ApplicationSettingsWidget.cpp       | 25 ++++++-
+ src/gui/ApplicationSettingsWidget.h         |  2 +
+ src/gui/ApplicationSettingsWidgetGeneral.ui | 39 +++++++---
+ src/gui/MainWindow.cpp                      | 12 ++--
+ src/updatecheck/UpdateChecker.cpp           | 79 +++++++++++++--------
+ src/updatecheck/UpdateChecker.h             |  2 +-
+ tests/TestUpdateCheck.cpp                   | 35 ++++++---
+ 11 files changed, 147 insertions(+), 55 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 658548f7..4f8a419c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,6 +49,7 @@ option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
+ option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
+ option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
+ option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
++option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
+ if(APPLE)
+     option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
+ endif()
+@@ -76,6 +77,10 @@ else()
+   set(WITH_XC_CRYPTO_SSH OFF)
+ endif()
+ 
++if(WITH_XC_UPDATECHECK)
++    set(WITH_XC_NETWORKING ON)
++endif()
++
+ set(KEEPASSXC_VERSION_MAJOR "2")
+ set(KEEPASSXC_VERSION_MINOR "4")
+ set(KEEPASSXC_VERSION_PATCH "0")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 110dc606..31f29033 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -195,6 +195,7 @@ add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible wit
+ add_feature_info(KeeShare WITH_XC_KEESHARE "Sharing integration with KeeShare")
+ add_feature_info(KeeShare-Secure WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources")
+ add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
++add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
+ if(APPLE)
+     add_feature_info(TouchID WITH_XC_TOUCHID "TouchID integration")
+ endif()
+diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
+index 7d701886..2acff446 100644
+--- a/src/config-keepassx.h.cmake
++++ b/src/config-keepassx.h.cmake
+@@ -20,6 +20,7 @@
+ #cmakedefine WITH_XC_KEESHARE
+ #cmakedefine WITH_XC_KEESHARE_INSECURE
+ #cmakedefine WITH_XC_KEESHARE_SECURE
++#cmakedefine WITH_XC_UPDATECHECK
+ #cmakedefine WITH_XC_TOUCHID
+ 
+ #cmakedefine KEEPASSXC_BUILD_TYPE "@KEEPASSXC_BUILD_TYPE@"
+diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
+index 88ac4fb7..be9e91dc 100644
+--- a/src/core/Clock.cpp
++++ b/src/core/Clock.cpp
+@@ -30,6 +30,7 @@ QDateTime Clock::currentDateTime()
+ 
+ uint Clock::currentSecondsSinceEpoch()
+ {
++    // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
+     return instance().currentDateTimeImpl().toTime_t();
+ }
+ 
+diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
+index 90b851bd..e6a7068d 100644
+--- a/src/gui/ApplicationSettingsWidget.cpp
++++ b/src/gui/ApplicationSettingsWidget.cpp
+@@ -91,8 +91,15 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
+             m_secUi->touchIDResetSpinBox, SLOT(setEnabled(bool)));
+     // clang-format on
+ 
+-#ifndef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
++    connect(m_generalUi->checkForUpdatesOnStartupCheckBox, SIGNAL(toggled(bool)), SLOT(checkUpdatesToggled(bool)));
++#else
+     m_generalUi->checkForUpdatesOnStartupCheckBox->setVisible(false);
++    m_generalUi->checkForUpdatesIncludeBetasCheckBox->setVisible(false);
++    m_generalUi->checkUpdatesSpacer->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
++#endif
++
++#ifndef WITH_XC_NETWORKING
+     m_secUi->privacy->setVisible(false);
+ #endif
+ 
+@@ -336,3 +343,19 @@ void ApplicationSettingsWidget::enableToolbarSettings(bool checked)
+     m_generalUi->toolButtonStyleComboBox->setEnabled(!checked);
+     m_generalUi->toolButtonStyleLabel->setEnabled(!checked);
+ }
++
++void ApplicationSettingsWidget::rememberDatabasesToggled(bool checked)
++{
++    if (!checked) {
++        m_generalUi->rememberLastKeyFilesCheckBox->setChecked(false);
++        m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(false);
++    }
++
++    m_generalUi->rememberLastKeyFilesCheckBox->setEnabled(checked);
++    m_generalUi->openPreviousDatabasesOnStartupCheckBox->setEnabled(checked);
++}
++
++void ApplicationSettingsWidget::checkUpdatesToggled(bool checked)
++{
++    m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
++}
+diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h
+index ffcfea2b..86688b70 100644
+--- a/src/gui/ApplicationSettingsWidget.h
++++ b/src/gui/ApplicationSettingsWidget.h
+@@ -56,6 +56,8 @@ private slots:
+     void autoSaveToggled(bool checked);
+     void systrayToggled(bool checked);
+     void enableToolbarSettings(bool checked);
++    void rememberDatabasesToggled(bool checked);
++    void checkUpdatesToggled(bool checked);
+ 
+ private:
+     QWidget* const m_secWidget;
+diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
+index 798971bf..678b55fa 100644
+--- a/src/gui/ApplicationSettingsWidgetGeneral.ui
++++ b/src/gui/ApplicationSettingsWidgetGeneral.ui
+@@ -86,10 +86,40 @@
+           <item>
+            <widget class="QCheckBox" name="checkForUpdatesOnStartupCheckBox">
+             <property name="text">
+-             <string>Check for updates at application startup</string>
++             <string>Check for updates at application startup once per week</string>
+             </property>
+            </widget>
+           </item>
++          <item>
++           <layout class="QHBoxLayout" name="checkUpdatesSubLayout">
++            <property name="spacing">
++             <number>0</number>
++            </property>
++            <item>
++             <spacer name="checkUpdatesSpacer">
++              <property name="orientation">
++               <enum>Qt::Horizontal</enum>
++              </property>
++              <property name="sizeType">
++               <enum>QSizePolicy::Fixed</enum>
++              </property>
++              <property name="sizeHint" stdset="0">
++               <size>
++                <width>20</width>
++                <height>20</height>
++               </size>
++              </property>
++             </spacer>
++            </item>
++            <item>
++             <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
++              <property name="text">
++               <string>Include beta releases when checking for updates</string>
++              </property>
++             </widget>
++            </item>
++           </layout>
++          </item>
+          </layout>
+         </widget>
+        </item>
+@@ -186,13 +216,6 @@
+           <string>General</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_7">
+-          <item>
+-           <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
+-            <property name="text">
+-             <string>Include pre-releases when checking for updates</string>
+-            </property>
+-           </widget>
+-          </item>
+           <item>
+            <widget class="QCheckBox" name="toolbarHideCheckBox">
+             <property name="text">
+diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
+index 6e3c96af..6776a59d 100644
+--- a/src/gui/MainWindow.cpp
++++ b/src/gui/MainWindow.cpp
+@@ -41,7 +41,7 @@
+ #include "keys/FileKey.h"
+ #include "keys/PasswordKey.h"
+ 
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ #include "gui/MessageBox.h"
+ #include "gui/UpdateCheckDialog.h"
+ #include "updatecheck/UpdateChecker.h"
+@@ -372,12 +372,12 @@ MainWindow::MainWindow()
+     setUnifiedTitleAndToolBarOnMac(true);
+ #endif
+ 
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+     connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog()));
+     connect(UpdateChecker::instance(),
+             SIGNAL(updateCheckFinished(bool, QString, bool)),
+             SLOT(hasUpdateAvailable(bool, QString, bool)));
+-    QTimer::singleShot(3000, this, SLOT(showUpdateCheckStartup()));
++    QTimer::singleShot(500, this, SLOT(showUpdateCheckStartup()));
+ #else
+     m_ui->actionCheckForUpdates->setVisible(false);
+ #endif
+@@ -687,7 +687,7 @@ void MainWindow::showAboutDialog()
+ 
+ void MainWindow::showUpdateCheckStartup()
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+     if (!config()->get("UpdateCheckMessageShown", false).toBool()) {
+         auto result =
+             MessageBox::question(this,
+@@ -710,7 +710,7 @@ void MainWindow::showUpdateCheckStartup()
+ 
+ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool isManuallyRequested)
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+     if (hasUpdate && !isManuallyRequested) {
+         auto* updateCheckDialog = new UpdateCheckDialog(this);
+         updateCheckDialog->showUpdateCheckResponse(hasUpdate, version);
+@@ -725,7 +725,7 @@ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool
+ 
+ void MainWindow::showUpdateCheckDialog()
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+     updateCheck()->checkForUpdates(true);
+     auto* updateCheckDialog = new UpdateCheckDialog(this);
+     updateCheckDialog->show();
+diff --git a/src/updatecheck/UpdateChecker.cpp b/src/updatecheck/UpdateChecker.cpp
+index 4272410b..14531290 100644
+--- a/src/updatecheck/UpdateChecker.cpp
++++ b/src/updatecheck/UpdateChecker.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "UpdateChecker.h"
+ #include "config-keepassx.h"
++#include "core/Clock.h"
+ #include "core/Config.h"
+ #include <QJsonObject>
+ #include <QNetworkAccessManager>
+@@ -38,24 +39,28 @@ UpdateChecker::~UpdateChecker()
+ 
+ void UpdateChecker::checkForUpdates(bool manuallyRequested)
+ {
++    auto nextCheck = config()->get("GUI/CheckForUpdatesNextCheck", 0).toULongLong();
+     m_isManuallyRequested = manuallyRequested;
+-    m_bytesReceived.clear();
+ 
+-    QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
++    if (m_isManuallyRequested || Clock::currentSecondsSinceEpoch() >= nextCheck) {
++        m_bytesReceived.clear();
+ 
+-    if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
+-        apiUrlStr += "/latest";
+-    }
++        QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
++
++        if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
++            apiUrlStr += "/latest";
++        }
+ 
+-    QUrl apiUrl = QUrl(apiUrlStr);
++        QUrl apiUrl = QUrl(apiUrlStr);
+ 
+-    QNetworkRequest request(apiUrl);
+-    request.setRawHeader("Accept", "application/json");
++        QNetworkRequest request(apiUrl);
++        request.setRawHeader("Accept", "application/json");
+ 
+-    m_reply = m_netMgr->get(request);
++        m_reply = m_netMgr->get(request);
+ 
+-    connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
+-    connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
++        connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
++        connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
++    }
+ }
+ 
+ void UpdateChecker::fetchReadyRead()
+@@ -84,8 +89,12 @@ void UpdateChecker::fetchFinished()
+ 
+         if (!jsonObject.value("tag_name").isUndefined()) {
+             version = jsonObject.value("tag_name").toString();
+-            hasNewVersion = compareVersions(version, QString(KEEPASSXC_VERSION));
++            hasNewVersion = compareVersions(QString(KEEPASSXC_VERSION), version);
+         }
++
++        // Check again in 7 days
++        // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
++        config()->set("GUI/CheckForUpdatesNextCheck", Clock::currentDateTime().addDays(7).toTime_t());
+     } else {
+         version = "error";
+     }
+@@ -93,38 +102,46 @@ void UpdateChecker::fetchFinished()
+     emit updateCheckFinished(hasNewVersion, version, m_isManuallyRequested);
+ }
+ 
+-bool UpdateChecker::compareVersions(const QString& remoteVersion, const QString& localVersion)
++bool UpdateChecker::compareVersions(const QString& localVersion, const QString& remoteVersion)
+ {
++    // Quick full-string equivalence check
+     if (localVersion == remoteVersion) {
+-        return false; // Currently using updated version
++        return false;
+     }
+ 
+-    QRegularExpression verRegex("^(\\d+(\\.\\d+){0,2})(-\\w+)?$", QRegularExpression::CaseInsensitiveOption);
++    QRegularExpression verRegex(R"(^((?:\d+\.){2}\d+)(?:-(\w+?)(\d+)?)?$)");
+ 
+-    QRegularExpressionMatch lmatch = verRegex.match(localVersion);
+-    QRegularExpressionMatch rmatch = verRegex.match(remoteVersion);
++    auto lmatch = verRegex.match(localVersion);
++    auto rmatch = verRegex.match(remoteVersion);
+ 
+-    if (!lmatch.captured(1).isNull() && !rmatch.captured(1).isNull()) {
+-        if (lmatch.captured(1) == rmatch.captured(1) && !lmatch.captured(3).isNull()) {
+-            // Same version, but installed version has snapshot/beta suffix and should be updated to stable
+-            return true;
+-        }
++    auto lVersion = lmatch.captured(1).split(".");
++    auto lSuffix = lmatch.captured(2);
++    auto lBetaNum = lmatch.captured(3);
+ 
+-        QStringList lparts = lmatch.captured(1).split(".");
+-        QStringList rparts = rmatch.captured(1).split(".");
++    auto rVersion = rmatch.captured(1).split(".");
++    auto rSuffix = rmatch.captured(2);
++    auto rBetaNum = rmatch.captured(3);
+ 
+-        if (lparts.length() < 3)
+-            lparts << "0";
++    if (!lVersion.isEmpty() && !rVersion.isEmpty()) {
++        if (lSuffix.compare("snapshot", Qt::CaseInsensitive) == 0) {
++            // Snapshots are not checked for version updates
++            return false;
++        }
+ 
+-        if (rparts.length() < 3)
+-            rparts << "0";
++        // Check "-beta[X]" versions
++        if (lVersion == rVersion && !lSuffix.isEmpty()) {
++            // Check if stable version has been released or new beta is available
++            // otherwise the version numbers are equal
++            return rSuffix.isEmpty() || lBetaNum.toInt() < rBetaNum.toInt();
++        }
+ 
+         for (int i = 0; i < 3; i++) {
+-            int l = lparts[i].toInt();
+-            int r = rparts[i].toInt();
++            int l = lVersion[i].toInt();
++            int r = rVersion[i].toInt();
+ 
+-            if (l == r)
++            if (l == r) {
+                 continue;
++            }
+ 
+             if (l > r) {
+                 return false; // Installed version is newer than release
+diff --git a/src/updatecheck/UpdateChecker.h b/src/updatecheck/UpdateChecker.h
+index ac6471d6..64430bda 100644
+--- a/src/updatecheck/UpdateChecker.h
++++ b/src/updatecheck/UpdateChecker.h
+@@ -31,7 +31,7 @@ public:
+     ~UpdateChecker() override;
+ 
+     void checkForUpdates(bool manuallyRequested);
+-    static bool compareVersions(const QString& remoteVersion, const QString& localVersion);
++    static bool compareVersions(const QString& localVersion, const QString& remoteVersion);
+     static UpdateChecker* instance();
+ 
+ signals:
+diff --git a/tests/TestUpdateCheck.cpp b/tests/TestUpdateCheck.cpp
+index 8cba43b1..ff709cd5 100644
+--- a/tests/TestUpdateCheck.cpp
++++ b/tests/TestUpdateCheck.cpp
+@@ -29,13 +29,32 @@ void TestUpdateCheck::initTestCase()
+ 
+ void TestUpdateCheck::testCompareVersion()
+ {
+-    // Remote Version , Installed Version
+-    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), true);
+-    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.4.0")), false);
++    // No upgrade
+     QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0")), false);
+-    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), true);
+-    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), true);
+-    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0-snapshot")), false);
+-    QCOMPARE(UpdateChecker::compareVersions(QString("invalid"), QString("2.4.0")), false);
+-    QCOMPARE(UpdateChecker::compareVersions(QString(""), QString("2.4.0")), false);
++
++    // First digit upgrade
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("3.0.0")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("3.0.0"), QString("2.4.0")), false);
++
++    // Second digit upgrade
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), false);
++
++    // Third digit upgrade
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.1"), QString("2.3.0")), false);
++
++    // Beta builds
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), false);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1-beta1")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta"), QString("2.3.0-beta1")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta")), false);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta2")), true);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), false);
++
++    // Snapshot and invalid data
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4-snapshot"), QString("2.4.0")), false);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("invalid")), false);
++    QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("")), false);
+ }
+-- 
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..1b2e89238032
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+	fi
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	dev-qt/qtconcurrent:5
+"
+
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+	x11-misc/xsel
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-dont_call_mandb.patch"
+	"${FILESDIR}/${P}-build_fix.patch"
+	"${FILESDIR}/${P}-update_checker_toggle.patch"
+)
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_UPDATECHECK=OFF
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 7f9cbf346b42..93fb3a1c35be 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -8,4 +8,4 @@ EBUILD ksonnet-0.11.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e3
 EBUILD ksonnet-0.13.1.ebuild 871 BLAKE2B de4a469dac9e43e91ce6eb9fafa38cac4ba7cb30a7aacedfa8ba57df4ef5aa09686a2677e98c5f03195fbe3ec1c8dc4a32abd087036158db1829408c0e2adee2 SHA512 793660b3a34fd44acdd1c11075bfad84f78f7b016c5280248d6706f5a586fb529bc7503003ad73db1fbe3375dd88b23f293633c8e0e7fe385e574b2a25f5231d
 EBUILD ksonnet-0.8.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
 EBUILD ksonnet-0.9.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-MISC metadata.xml 324 BLAKE2B 89e56104008d1d0adfc928707dc011c96d3169f299d4b8b7dde1bf4fad5221728ed3d2b5a4cda9aed69f3ff16ba202c3bf445946ccaa169ebedb22e001251602 SHA512 9f554c4509d955b3d88f15dab2f0bfbf9862b52bea5aab36fea37c4b863080a5378a76087baa2f3be7e8ade5a7fd519d80deecb394d3ead642d1c943faba8809
+MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/metadata.xml b/app-admin/ksonnet/metadata.xml
index 317ede0369bd..fbe8de267df2 100644
--- a/app-admin/ksonnet/metadata.xml
+++ b/app-admin/ksonnet/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">heptio/ksonnet</remote-id>
 	</upstream>
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
index 7e5ba2aa118b..4f576cc1496f 100644
--- a/app-admin/su-exec/Manifest
+++ b/app-admin/su-exec/Manifest
@@ -1,3 +1,3 @@
 DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
 EBUILD su-exec-0.2.ebuild 595 BLAKE2B 44e9e1e201b74506b2d1bdd0d25f8e957ba5b7dd4db859de6708bd33d2c122d046a51122f7096936621c7e60dd0e5d44e565295cba4de4b055b3d2e7f8244f9d SHA512 2a008451f0277ac2bf5e97cca68078e4f333f0b488ca8750b22e75dc6424d45ce34c214e5b6513835b8faba6c40caab1506ec8e208ea231f2144ea2fb0d6a4cf
-MISC metadata.xml 323 BLAKE2B 56dfb262d3d2714721cbd8436aaaa6628ca11013bc801a7d9a18fa5a87d4e20e41d98584f344a98b8f697ad6427f6641bba7090b562594b08995e8b31d4d2292 SHA512 3eadc250f3acadea3d3b3f29ef78380ed153b12b34b5e752dd088470949dec3590889b8daa6db37472ed043a10f14f5bf2e8c280fae7efd3ee398fa5d88b0caf
+MISC metadata.xml 245 BLAKE2B 7ec08f969d0cd84a8313e515dd84440cd6417c661672f00be444ebd11b79f3ef4ead9f7318088ecc6717147a9428d9de024441825264f545e71e1fbd2aea5210 SHA512 5378ab531062e61d8cbb78d685c8c343bf5339e8f3c5462bc5447adfaf7015d1c1e2eee787b258ef90203f42a0ff94180ca57579316774dd9e5f5ec2f07b6669
diff --git a/app-admin/su-exec/metadata.xml b/app-admin/su-exec/metadata.xml
index 662615bdd73c..994ac4d0e54f 100644
--- a/app-admin/su-exec/metadata.xml
+++ b/app-admin/su-exec/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ncopa/su-exec</remote-id>
 	</upstream>
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 79d54a03e4ff..586cd15d35b1 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -8,7 +8,9 @@ AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c4
 DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
 DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
 DIST supervisor-4.0.0.tar.gz 432825 BLAKE2B 2eca01119f6bfd6bea728ea297424e6e08cc94cc8da78e53fc431013b83b5620a8c88f1a6ef0fcf5f57df46ad43f04215425bede83c02479731795b326dd27c4 SHA512 cca945179aaa16cd7042160b44a2d80e4a6aa388dcabd1572c6ed8610dc6af06cb446a18a5f8fa868a891482032380bf176c1331d9d09702d59fbf8b01651577
+DIST supervisor-4.0.1.tar.gz 433742 BLAKE2B dc0683566c9b052c6a832e09eb6eba76890f07f5b67a1c129343ed3de31e5dc88777cfcb1b3c06a6a687160c172c3d83227765678c9c54239fbe57eb9b5ebd0a SHA512 e2e0e92ef1dba74ea4e3e70c2bd56b8a497d22db8123411f4f2019b45626606e90030577ae79aa8b81103c2f337c76d7516f94bb01e97172e2e541ec44d0f1b9
 EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
 EBUILD supervisor-3.3.5.ebuild 1959 BLAKE2B 168867deedc11199bff5b9d25d44056219809f35c3627a720469d755b3312f704d6568ef9331d46b4b177154707b10721c7058ead18af690b57c98f5ce912262 SHA512 9a35ea4c5381762644e00c2de4ae3272537e12357fdf17f2daa7b8c9a9187075f4625c38c555a3d6f32c4690fd8940deebaf3a27d4de9ca08fc8aa1797ebc30e
 EBUILD supervisor-4.0.0.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
+EBUILD supervisor-4.0.1.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.0.1.ebuild b/app-admin/supervisor/supervisor-4.0.1.ebuild
new file mode 100644
index 000000000000..2741d256322a
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 systemd user
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/.build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}/init.d-r2" supervisord
+	newconfd "${FILESDIR}/conf.d-r1" supervisord
+	dodoc supervisor/skel/sample.conf
+	keepdir /etc/supervisord.d
+	insinto /etc
+	doins "${FILESDIR}/supervisord.conf"
+	keepdir /var/log/supervisor
+	systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+	enewgroup supervisor
+	fowners :supervisor /var/log/supervisor
+	fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog ""
+		elog "By default, only members of the supervisor group can run supervisorctl."
+	fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 543054492bba..e83e428af5ef 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index add5cedea3d8..6a07e28ffd28 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,5 +1,3 @@
-DIST lzip-1.20.tar.gz 103426 BLAKE2B 1d72b2132e9ceb67339a10bfdb728be2e5057df571306c698fb06b97c8fc310ce6cceca1a9fd6470fe34f4f6c3b63ee28d791d293418ffe302c84219cb92d35d SHA512 0349b4c6c0b41e601b7ee381c3254d741397beb3ef9354c08162f346f131f4f48f6613ee0a610cdc6d827530df634f884ecfeee35215b10045a40fee76f8e938
 DIST lzip-1.21.tar.gz 105558 BLAKE2B 07658ec901bdfc255fef5af24b62614b2db9821b9a2820daa5137fd47ede0b68bbf3eac340ad5484d2ef7011d15c2eaccf19abc9e33b5c96273fc9b9d323083e SHA512 02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362
-EBUILD lzip-1.20.ebuild 864 BLAKE2B d5f269e36be04a09fb683e522d08e2e49948b3a3af59a59dddaa26b0a0f33a8526e24bf1a5acdb02121b54ceb3c134c0300a290f1714a91b0d9b0cfddeee8147 SHA512 08a914e9d8d44246005f4bfc1c676d47a331bb0ba9969d9f917b0505a46915edbad6c351b34f65e7f61e9fb68c3379c442ccc8e71c98269998c9f137d509a6c3
 EBUILD lzip-1.21.ebuild 861 BLAKE2B 3774236197625b01fc21762d208433ed3af023fb3e5c447ff676d0e8869551121a04ae39d688c37554457987913927f1108a1f48eff6b00b8b4fb8f591db3f2e SHA512 0eed8b58844b8a6c62ebc5f2f51f9b0aeb53bfcbde0fdf6e8b5cac51876ed7cfaa4113b618ce5d412e53737fe53ff64c029e1c46ad284c1c135a56e6c906a562
 MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.20.ebuild b/app-arch/lzip/lzip-1.20.ebuild
deleted file mode 100644
index 47a0a3085373..000000000000
--- a/app-arch/lzip/lzip-1.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="lossless data compressor based on the LZMA algorithm"
-HOMEPAGE="https://www.nongnu.org/lzip/lzip.html"
-SRC_URI="https://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.tar.gz
-	https://download.savannah.gnu.org/releases/${PN}/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	# not autotools-based
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		CXX="$(tc-getCXX)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest
index 83936f5a2229..ddea26d2e0cb 100644
--- a/app-arch/sharutils/Manifest
+++ b/app-arch/sharutils/Manifest
@@ -6,5 +6,5 @@ DIST sharutils-4.15.1.tar.xz 1126672 BLAKE2B b570ae35c0f516cdd24c75f59596a0cbff1
 DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d
 EBUILD sharutils-4.14-r1.ebuild 735 BLAKE2B 2afdd68f317d6affd432d6d291a7516906b992f5cea53c1a4cf794fb5dd4da03006759b005f6e66ba7abec0d9ef636dc56f910affe2c6dc43b6f8d337010bb56 SHA512 53c7501e69be3b24924b7178ba561d997a579ac12f45e6e36abed598debee3917ec0bafaba3207a9b266918da3ec055279daaf82544af94c6e0e5b3b2baee71e
 EBUILD sharutils-4.15.1.ebuild 748 BLAKE2B 7af24df5f5a521195425ca96994d285b62f58a08398751ed73c450480af9213f7dd0255d227663c3811a69baa24c911709c6155b9ac400559369ffc43465dfc1 SHA512 b0c5db15b48a7eae0f690b8693b532f070eb29905eeba07f996cf0b46799c13daa9f5192ad15d4e5c1322e38c1519e730e11347d43ba890dc302d74f43bca8fe
-EBUILD sharutils-4.15.2-r1.ebuild 1053 BLAKE2B 56f0f6115ec152b2b836ae5f88727d7a1180fc2b71df8dfa85d3658999e538944cc288663e76edd5ecd77187ba865b7d68dc0ccda3c94539029669f380c17181 SHA512 541c62e5c1720aa999ad06cc8c19a7994418a91c3b423894554df35f8c024f0817efb07d5357b88f4c2981ace6ffdc48462aea1bf4d2d634eea584bfb207126e
+EBUILD sharutils-4.15.2-r1.ebuild 1052 BLAKE2B 713013df577b97bdb377a4884262700ee7c1e2aac44ecfefa6429fcdebb7229fd1186e919c3cc34836162622575e3e651e51dcdc0b01c528b771c0b5446df277 SHA512 2b784396da73690f867223037c6f6a227b86837325d8362bde419e77f31297b66ccd4f3e22cc6010b834f2b48e436991807ad6d509c0608f4b0bd34fd3714559
 MISC metadata.xml 335 BLAKE2B ff8d1603a99aeb199526f9ec3c768adc461d09ae2d5dc5d73bdf2bea0d369dafc75c358b23ed68d4567e8f691b3d84d706356e8496d2b5d181e58563bdca8826 SHA512 4670be25ae746c8384beeff118f00b44d00fb9db553d4d64934bbb6f972eb21e2a4b28e2d5a6a6a708280acd51bed2b2acbb7552165c43a75eb497eb0c04dd94
diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
index da1dadc5e49f..d290cf4603c8 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 7124b9423e83..efeaffe57439 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -11,7 +11,7 @@ EBUILD zstd-1.3.3.ebuild 1275 BLAKE2B eda6bb4eef626eabe52756afcbc2fdd2bd9bc98f17
 EBUILD zstd-1.3.4-r1.ebuild 1328 BLAKE2B cb6df01593f2bf6f52d0f54759aaa03fa610bd4a63b0c23f3626f7907af26fbfa038842ecb7a1b98b664f9b072e85b5318fc56f059a6b73b0c2e677aae17121b SHA512 8fd02dbc9f09143c81d90e2931812cc42877a0955960232947ba8e50dddbc55f9cbe2e2f60e4f4f53b1ed7122f43bd4976741e4a24243e0360e8e6fbc82ffe5b
 EBUILD zstd-1.3.4.ebuild 1275 BLAKE2B eda6bb4eef626eabe52756afcbc2fdd2bd9bc98f17cd014dfb2bfd539348c24e962ece86fe3e046ec94446830030abae40a4684d9f72da6b19ed13283c29032e SHA512 06a63556480f4eeea9befc6dcf355ebea7e98f116208d00a7cb51f88947bafb46351c06394ff6d0a4d8692ae7cc92b50be07cab70771287f98143c175e8cd228
 EBUILD zstd-1.3.6.ebuild 1337 BLAKE2B 261fe4408750ddd70adbad7403bad6e190faa1b1e6b0f7115bbf73471cec8642092c303e158bf728b4eef823f746687e28d0a27ca63830c3e31914c6ce18a090 SHA512 5a803fcfbec86c454af205706f9e416fe5863c7ee675b3c6a8191c315f80e38e1ab5d3203c82b47a85a189a30f801fc4301683aaede06bdddae3758f98948a24
-EBUILD zstd-1.3.7-r1.ebuild 1797 BLAKE2B 2b26eb978d5405c482ef9fc990f3cffdf4fcdc105318c37c584a7bc50a0eddd946c736acdf5de210a0d08fb7cbb805c2c13e259c2804e3b91ea9a57f861ab9ce SHA512 98639d50f43a2e6e0f366c07e227875ff312b41238bd52d48587ef5c0bc6ad76a081586fa4dc1f6521887ca98b565e37bbdc8e78003abefea4ef8e7f444287d3
+EBUILD zstd-1.3.7-r1.ebuild 1796 BLAKE2B 6e90786f868269eee72bd22e90e21947f06c163a2d6c7c66df532626953a2ac1c2e79c2ac020d00af9a78406f12b7abfb0605a00f6d81864975380097d5b6c41 SHA512 a13b0b615f2ef8d30e50c438221464cc8f2036d1c283462bb4b3f7ce07a526d2c7735e889682b9c9a6d16b90f53ca3959a4184355e498cbb99bac00273fec29d
 EBUILD zstd-1.3.7.ebuild 1337 BLAKE2B 261fe4408750ddd70adbad7403bad6e190faa1b1e6b0f7115bbf73471cec8642092c303e158bf728b4eef823f746687e28d0a27ca63830c3e31914c6ce18a090 SHA512 5a803fcfbec86c454af205706f9e416fe5863c7ee675b3c6a8191c315f80e38e1ab5d3203c82b47a85a189a30f801fc4301683aaede06bdddae3758f98948a24
 EBUILD zstd-1.3.8.ebuild 1805 BLAKE2B 183fa31c25a9c70f45c3894b1b5ac5e0a854566d0880daa08aae1d39ee1b6f86e6e5be9595b533588b14f0c40b8745ce381dacf31f935c034d9bdc7cf26bbab0 SHA512 5c3fc22d3428c85c275b54048eaab998b0a9496ecca9ac5e7d48183e40a33b0c352111524df0961bf5c7a0c0e07c5eeaabe389d89edbf0f524b5430db94fb154
 MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild
index ef64a822b809..d7ee5a0596aa 100644
--- a/app-arch/zstd/zstd-1.3.7-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.7-r1.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 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c42cd09639b1..4a80a4350ba4 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 2f5abdef4c38..23058e65cc95 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-daemon-3.2.1.tar.bz2 82426 BLAKE2B 282b1a62ca3a770e709ff31ee7b72ed9f5e102c5f318a765a99421c93881e9ecacfdc5867af494e69dddda40603c8eb6cc8904a7c82fec004a6d5644a28a9f87 SHA512 399dbb818de8a550bd31784a5a7f0adb9d2e35d922ba71f341df81d20fd7e5ebaba5f31db1554caca17919325773f9ec6bb3d5ae99afa5d6eaf5b22142e010ee
 DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
-EBUILD cdemu-daemon-3.2.1.ebuild 1140 BLAKE2B 3a9168913ac901d268b46137fe8f705866df375172dce36e67a8302d9191ec2c991804a264972260b0f2c59f66d15adffb4fab1cd0132211a34d2926b0d50b21 SHA512 747f5c96c441723873e147f6111d12dca95be0da67dc7658b7fe2a395e524f6af24369b4b932c3de328c46bd4b4a73f258c935e285ee8d9d47398cd68d911f3e
 EBUILD cdemu-daemon-3.2.2.ebuild 1140 BLAKE2B 37bf7e266dcbf187004b9e6184176791873d8a6ef29d11e2a0348d606affd72ae5fe8a0ced71e44c460ec218cdb41dd4073539000920fc290adfa7a7a10c2383 SHA512 2e05466f5bdec9615e5bc03343706b2abd1c310532364fb09454170aa2389f70bb490a1538e2097dadb73131907f2820e4b9ca8f774f12c1a94d1e922e322adf
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
deleted file mode 100644
index 6db965c48f29..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-
-DOCS=( AUTHORS README )
-
-pkg_postinst() {
-	elog "You will need to load the vhba module to use cdemu devices:"
-	elog " # modprobe vhba"
-	elog "To automatically load the vhba module at boot time, edit your"
-	elog "/etc/conf.d/modules file."
-
-	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
-		elog
-		elog "${PN} no longer installs an init.d service; instead, it is"
-		elog "automatically activated when needed via dbus."
-		elog "You can therefore remove ${ROOT%/}/etc/conf.d/cdemud"
-	fi
-}
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index a7beffc363fb..9a4b32d4332e 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-client-3.2.0.tar.bz2 43588 BLAKE2B 0f75bed1ce2a715bb7acf227ebd3da8b80cf6418e28b0d352f294121c1f67acb8c6bab5f5dc5c768150ad46830b823d66f1940887c66225d20b41827c1377d31 SHA512 778f2ecac828ba278d0ded875c7bab2415f1c1acb62f4030eaf161376869939c48bc16a6d660326d9aacd2af745ef9dc9158f922a72aa8ccbd47f05ce41b8cd7
 DIST cdemu-client-3.2.1.tar.bz2 43584 BLAKE2B d34c09203b7b4e70161d62aee48d531b083952174fd2357bf0fc7b69a0fd59200bedb9ca87fe2d2c18c953979c84e9db3fec4d5fb500375f0bcc155dcaf5cedb SHA512 913c26754d16c339d7ddb4e00cc7d5b754ad6cc7f1a156c9448b51ed09468cf9e8a2bc74ed123a621278d2ad281e447d33ee06c3416bc1d0d2e6c2becd539154
-EBUILD cdemu-3.2.0.ebuild 1083 BLAKE2B e1909cc305fc2b5e1ea3b17dc9db089c9495a537a677eb17a007b19cf993b1d34b9d633bbdf1bc4329532708f3c196bc31127a243498a15941ef0de2059ce13c SHA512 e1054fda4e2a1cd8edb3f2691c766a4aa90f775ae57e6aba26c95d7f6df9b320930b506baead99577bb7e6d5482912e4b5878a67fb45c859e3d28c09834e66b2
 EBUILD cdemu-3.2.1.ebuild 1083 BLAKE2B e1909cc305fc2b5e1ea3b17dc9db089c9495a537a677eb17a007b19cf993b1d34b9d633bbdf1bc4329532708f3c196bc31127a243498a15941ef0de2059ce13c SHA512 e1054fda4e2a1cd8edb3f2691c766a4aa90f775ae57e6aba26c95d7f6df9b320930b506baead99577bb7e6d5482912e4b5878a67fb45c859e3d28c09834e66b2
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.0.ebuild b/app-cdr/cdemu/cdemu-3.2.0.ebuild
deleted file mode 100644
index 13ab76055be7..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 306935b16cac..5b7882d1dea0 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,3 @@
-DIST gcdemu-3.2.0.tar.bz2 52144 BLAKE2B f349e4482905b0ac59bce5d6af74000e05ff9b7257c7ec8755106ac8fe316d59d19de8b72705fd9cccfa888d170776667ee07fe90311a81e78f251fee85601ee SHA512 61a1775c874c9c3604ce88758039ef80b262463ae180e791eb545811fa2176e4bf07c4dbcd3be5f17d446fdef92317a0ff64ce8d27f26aeaeee9d8134b6a95ea
 DIST gcdemu-3.2.1.tar.bz2 52231 BLAKE2B f6b0025f6c5e79fe7312bf15b467327152e561db33f6190847e4e702cb98ff8005b37fe997c721b5c76cd64d64bafef1c015a9151c0ee200c52efcb849c93dba SHA512 c2da75d985981ccd0b44f210745670501fecd0ae7c60bde783fc5f91ab4c629c6eab9e8b35df906b5669b6518d3bdf36c5814b513c0f3e2d703659d23df1c82e
-EBUILD gcdemu-3.2.0.ebuild 1129 BLAKE2B 4af93d2a9f88cce37cc032ece75a76b4a6462df0a2226fe5c67c5fddc84351374af74b0b00ee76624af339bb847c178b4e1317355142261722e16fbe90d34814 SHA512 8c5494ce53fd55b5fa97d339ed46840eb7d873fd71e14c255588d5fc038f0f4786cacd865151f8e425cfe48cf3208d6b5d479adb0cf283f22f0144178d5b2897
 EBUILD gcdemu-3.2.1.ebuild 1126 BLAKE2B 83d124dbff92ee58cbb98462a4e3c5f27c3768126080c92acc4c583b394a7a22061a5572c1e9e0ef2b4dafd4e8a2fa2371a451bab83ae41c263f17707160cb74 SHA512 12f655a59b792b7562eadc9a76959ac599b823d1bbef7a3c218c8d7286a1c5df939a11828a219ac9f92c2dfb4462199c6ca4c2233503625959f0a9a0eb18cad9
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.0.ebuild b/app-cdr/gcdemu/gcdemu-3.2.0.ebuild
deleted file mode 100644
index 2600df099363..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index db6e0d4602b6..e76b4e8f7464 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index 26795669dda1..639d410b936c 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -2,4 +2,4 @@ DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d
 DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
 EBUILD cfssl-1.3.2.ebuild 750 BLAKE2B 68a9cb8b12c8f5accdd88c17dfbb061ba9213e5ba3e975ccc3b40bc69d6a16e8b4092462f45c84863e576a3586dca0d2d256b03a0fce8a4dc679f933a0645a76 SHA512 aefe6c912d5b40145a01bcdc273abacc1a93e5c76b12f26b0a04db13e6fccb9041939469fd98ed507adc5ca4ca84ecdf8833422643f87777331ddf27ca9448fe
 EBUILD cfssl-1.3.3.ebuild 751 BLAKE2B 8d4ed51cb89139b96f1dc089843dc667e1e9209f95c7cc387815da16abebf224c123c68dc38ea81f57ee26d6bbdf3ea223401b3efe1067b26ce2ebe2443c3e05 SHA512 4dcf38025a8c280e310a92e97560cba2b3bac9a4ac4e8e15010e14d63023ebb407470976425d7b7342a9236195925afbb72a6ac736bb51ff646f508475f43b04
-MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
+MISC metadata.xml 329 BLAKE2B 5188aa700150b22b0d2972d57ee0db2d1a2239017edbf9547961126b7158060c74aaafd1ffedfa25f76402766a4403d41f3875a8bd2c43d84150177879e35186 SHA512 b56f2d72ad1a5ef0c2531cc1d3524bf13f7089d099bbd774d1774aca5dfb7f8c074b945203ccb80672c154f98d8728cf9d8671e7df9b328c01c2e79cb9ba8be5
diff --git a/app-crypt/cfssl/metadata.xml b/app-crypt/cfssl/metadata.xml
index c1d955e20a40..cc044347cf55 100644
--- a/app-crypt/cfssl/metadata.xml
+++ b/app-crypt/cfssl/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">cloudflare/cfssl</remote-id>
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 983b5e9bebe2..305ae6c6e13d 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,3 +1,5 @@
 DIST signing-party_2.7.orig.tar.gz 201320 BLAKE2B 4fe5781b610dc8acd5166fc7ce7daa1b856f6617952d5eb226cae0c8c6fcaa196b88ffe313b2d71b8f11423a81e84f2124d9adea86edbfb0d22808473d1c36fe SHA512 d1599ca0cb2dd554b4688bc8c77f4a1dd907d00539bb11abe147300dd2184f8548ebe9fdf793e83e2956a220b1c4bf9e19bd543b77f724b0c8ea4794ac945985
+DIST signing-party_2.9.orig.tar.gz 222606 BLAKE2B 5c7fd8fdb4945f3155d5dc146716ae402c72ec3cc728feb5b3d009878d88313ed26dbf4461820346bd3340ec84d9a439dfd52950452ad796bf1fbc98a342ff6a SHA512 31a0f15f679c0339753bafbac645609e9e16f3da2c5105c33e87e0f258453b3101f188398a7c1509fe5c005339289ac5465ccb18631a526d231c714f9ed61d96
 EBUILD signing-party-2.7.ebuild 2968 BLAKE2B df347287636b0bfa29282094950cf6e5f0d95b205bac4882183a66608c5a92591479fda6fa2a9d5cc62c3127049f56f4bde99f5c105320e0d196624ad389ab81 SHA512 0762ee598cfeddbbb39a41d7b718bc1e3b03f2d5f6a347453b95ae15ea39736e9fd45ac217e05d10c8382037112a11ac7d7026a663b35797c26093a4ff06f67b
+EBUILD signing-party-2.9.ebuild 2715 BLAKE2B 87224f5404fbb5b53afc6c3058820459644e85438ba15984144b089a60550e3390a95844b2b9d61e7e474a21db7e617af2aaf57a7604f5a7c871d86682a3019d SHA512 c3c9be2ad0a1d856b40df972a94575683fcd7bf026e9414844e6e5e5a71bc4f60179f87ae6da8c85cb601df2af2ab1c28af173dfe3a14fdb950e57e64a5218e9
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/signing-party/signing-party-2.9.ebuild b/app-crypt/signing-party/signing-party-2.9.ebuild
new file mode 100644
index 000000000000..f1181a3c174a
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-2.9.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="A collection of several tools related to OpenPGP"
+HOMEPAGE="http://pgp-tools.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-lang/perl
+	app-crypt/libmd"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.3.92
+	dev-perl/GnuPG-Interface
+	dev-perl/Text-Template
+	dev-perl/MIME-tools
+	net-mail/qprint
+	>=dev-perl/MailTools-1.62
+	dev-perl/Net-IDN-Encode
+	virtual/mailx
+	virtual/mta
+	|| (
+		dev-perl/libintl-perl
+		dev-perl/Text-Iconv
+		app-text/recode
+	)"
+
+src_prepare() {
+	default
+
+	# app-crypt/keylookup
+	rm -r keylookup || die
+	sed -i -e 's#keylookup/keylookup##' Makefile || die
+
+	# media-gfx/springgraph
+	rm -r springgraph || die
+
+	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
+
+	sed -i -e 's/autoreconf/true/g' keyanalyze/Makefile || die
+	pushd keyanalyze/pgpring
+	eautoreconf
+	popd
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP=true
+}
+
+src_install() {
+	einstalldocs
+
+	# Check Makefile when a new tool is introduced to this package.
+	# caff
+	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
+	docinto caff
+	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
+	# gpgdir
+	dobin gpgdir/gpgdir
+	docinto gpgdir
+	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
+	# gpg-key2ps
+	dobin gpg-key2ps/gpg-key2ps
+	docinto gpg-key2ps
+	dodoc gpg-key2ps/README
+	# gpglist
+	dobin gpglist/gpglist
+	# gpg-mailkeys
+	dobin gpg-mailkeys/gpg-mailkeys
+	docinto gpg-mailkeys
+	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
+	# gpgparticipants
+	dobin gpgparticipants/gpgparticipants
+	# gpgwrap
+	dobin gpgwrap/bin/gpgwrap
+	docinto gpgwrap
+	dodoc gpgwrap/{LICENSE,NEWS,README}
+	doman gpgwrap/doc/gpgwrap.1
+	# gpgsigs
+	dobin gpgsigs/gpgsigs
+	insinto /usr/share/signing-party
+	# keyanalyze
+	# TODO: some of the scripts are intended for webpages, and not really
+	# packaging, so they are NOT installed yet.
+	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
+	dobin keyanalyze/{keyanalyze,process_keys}
+	docinto keyanalyze
+	dodoc keyanalyze/{README,Changelog}
+	# See app-crypt/keylookup instead
+	#dobin keylookup/keylookup
+	#docinto keylookup
+	#dodoc keylookup/NEWS
+	# sig2dot
+	dobin sig2dot/sig2dot
+	dodoc sig2dot/README.sig2dot
+	# See media-gfx/springgraph instead
+	#dobin springgraph/springgraph
+	#dodoc springgraph/README.springgraph
+	# all other manpages, and the root doc
+	doman */*.1
+	dodoc README
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index c0bec9d9e1de..00b12839a15a 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 0724fb0901f5..b96161807a0c 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,7 +1,9 @@
 DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
 DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69f5c55078371c5b416e34784835350de9bd40fc5d85e59116022874294f74e259a034d6ebcaf315b1ea9942b8350c7b SHA512 5887171cbe95f545eb6e647aee2d04a26ab9102643acd8d3e5754000613a7fb08e4470777f7dfbfd0d1ed7609de7a6241cd82f5c7d62f632b2e3751b005bc01e
 DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
+DIST gnucash-docs-3.5.tar.gz 97187415 BLAKE2B f35a3a25a120d3807771d74ee1c97713e21617f7ac7b4fdc1f58b9d12f7c0cc899a9af6abca21bd4f91a0978ebf5b93604deaae29f39c8ab86bd83ec93e32642 SHA512 aa832a1929ae91b9fe2a6a4ada0c7dbd8c1a4cf76086ec3ab0b82c7396d45aabbb6971f2db788bbdde71a68c8faca5f4621429819ef6c0d1156bcefdc5d289b5
 EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c3246be6902ccea2198832b6dc5409f93ae06bcaf52e091f88d6df6b8327a77198140b67671b0f7a242a0e2bdccfb510222 SHA512 e95eab369275cfac0b5944ae8a0659e5743f44e76c650b78c055246d66c0b953ff8398070b87c3e1f341722b7d51ceaa6896b27b2dc8e424bc9a5e5ae40c3406
 EBUILD gnucash-docs-3.3.ebuild 1666 BLAKE2B 83ab7ebba3c17425df70be4e85f9c26032faf67bd88d16f42dc65cee0486ede8bf50b8bd8eecfbbb5a2d7e2d552cea6ec48370edf8b8c3ed0505abad0cb9e544 SHA512 38f8145072110b0611563ad592113d5f60a96a43986c8ec819ad3a66f6064406f5e929e37090e9bfcd3dae4ffe387ac6fb7dbf2e4610bde6b80a7bc14f6d4e8c
 EBUILD gnucash-docs-3.4.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
+EBUILD gnucash-docs-3.5.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
 MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
new file mode 100644
index 000000000000..2fd86099fbde
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="C de it ja pt ru"
+PLOCALE_BACKUP="C"
+
+inherit autotools gnome2 l10n
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+for my_locale in ${PLOCALES}; do
+	IUSE+=" l10n_${my_locale}"
+done
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+my_l10n_get_locales() {
+	local l locales
+	for l in ${PLOCALES[@]}; do
+		use "l10n_${l}" && locales+=( $l )
+	done
+	if [[ ${#locales[@]} -gt 0 ]]; then
+		echo ${locales[@]}
+	else
+		echo $PLOCALE_BACKUP
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in $(my_l10n_get_locales); do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						my_lang=C
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			cd "${S}/${doc_type}/${my_lang}" || die
+			emake DESTDIR="${D}" install
+		done
+	done
+
+	cd "${S}" || die
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 23ef104c25c8..c3e767cfcd75 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 99de8904fb3b..fd5e38168b0b 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -11,7 +11,7 @@ EBUILD gvim-8.0.1298.ebuild 10451 BLAKE2B 964edd3f4b549368e0d0f0f4e46e4951a6d2fe
 EBUILD gvim-8.0.1699-r1.ebuild 10441 BLAKE2B 2a57da613526835bace267032a7c8d24375f6c8805c1d2941366864f5869634437609a8a21f1f42668c52970f41e9091094c21e06eac8961e0f3492262ac6c51 SHA512 55551739d531f6036661203ba2bae5cba0f3fa4e49ada5d11c280272e24eabb2dab941cb51a73c5b93175e4ba45e3d09a352fe1ddb624f3abd39e942963ab989
 EBUILD gvim-8.1.0034.ebuild 10440 BLAKE2B feab87a2dda8d2e59c79179f3736963e645da9d6045ad591b8b4141181c9d52dcc417e0569cd4b60e91bedb662b2be84cffa053848108cf23973a150b8878036 SHA512 1f7b34f98fac3c68b0aa866e7c6cdb50a3f2a3cb6be2b24bf1b9006e01131b3d1d88576c6195ddafe5ee3e234c4b39d45c94fc5d81a2b2bb83de9a26e019fa53
 EBUILD gvim-8.1.0412.ebuild 10428 BLAKE2B 69352c472327a455a501766af33297e991f85bb6521e35df2e2e9615bb415c744a5579e7367582fee7d93e637afeb169f68b2de8d595005d5bbd636c3d76364b SHA512 67b6e99586afadefe1b48c93f76526a52f47d619bcfb7e33f3ec93032e976c30209ac9f42ad4000fb3b45c6ea335598bd6e664bbdc09acb4bce56f9f01a9348e
-EBUILD gvim-8.1.0648-r1.ebuild 10639 BLAKE2B 15b328f377fa5dfa036673438e06f3bfb5d48d9b8f0a832bc649e89fde273b393cb2950aae99b97821a53009360a0af6d1ce28d601c863b5cf5191dbe6404cfa SHA512 9782ed4273a0c6491a08566bddef80a6b57e57c3378503972739e2f161145585f972862111186e94d77c1f45b8a6c07ab0d65d95262a5c34e58859ae2010aa9a
+EBUILD gvim-8.1.0648-r1.ebuild 10638 BLAKE2B 75dda753fb489508d6c8b8aa9032fc58bbe7a45a1972256cc583a4b54ad36e2a69b96afdf67751a138b6d60cbd9882c1c2222dad184e3853a29ebac9a0d49999 SHA512 58edd18d2ca80248087963532873ff3731fdef05607bd9bbcbba4795eb9fa8395fbd4ec046d01d3988513baee48a53b683d2268f0d33787f8f163c74a7e97a4e
 EBUILD gvim-8.1.0648.ebuild 10482 BLAKE2B b5b81d2888a97a3e285e6afbe3a64f537a54e4dc7efb751a31a1b325c7c7e814b65bc75618d2a4f6ceb83c97665e75ed75a89bd3dd2d3ceb63a9e2ade0c4df77 SHA512 7a2b4e6fa5fec0ac3c0b889eb13dbe995c216507f042365e5174705e717c07a4504d48e9dd1056582765c9f2fee0e69c8f60e05b1c359bc353935e45e2a7273f
 EBUILD gvim-9999.ebuild 10552 BLAKE2B 6375e740e1519a6faea6ef8453b91091f51daabc7a156a893d7bc5e8d4093139e1136c6cdb298b9542771b3ccb96af82857718a3ad845de327fc2a05438e81f6 SHA512 f0195aa09f984300325b0b282e600a6dc417eb03711ec047db38d95a43f7640051bdf5ab6b28a113ce4c45537933257b03de2dfb53fd916dffd6d2119e612969
 MISC metadata.xml 633 BLAKE2B adc5dc111999d95087e2ef224b82e931b2baa638eb377a08197bcc1114a83efd6c09bd6ce09e821dc1534fe0dc925116bc48dba74cee4579c414a99da09d8dd6 SHA512 f6388b8d254f166dd5c8a03117f3f0448a7e5ac196577aed5c05081d702cf611733f1ca9ad6e93e026c025e73132066dff5b75e3ada68d83746d6519e99e3036
diff --git a/app-editors/gvim/gvim-8.1.0648-r1.ebuild b/app-editors/gvim/gvim-8.1.0648-r1.ebuild
index 5de30236a277..3d9104e3d934 100644
--- a/app-editors/gvim/gvim-8.1.0648-r1.ebuild
+++ b/app-editors/gvim/gvim-8.1.0648-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 48a13ba5bfaf..3847e6aa2bfa 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -11,6 +11,6 @@ EBUILD vim-core-8.0.1298.ebuild 6637 BLAKE2B 929e33024cfd7e70410c4cd4602b6b6360b
 EBUILD vim-core-8.0.1699.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38
 EBUILD vim-core-8.1.0034.ebuild 6648 BLAKE2B 2ac8f5d559cd74e720dacacc8b609d1646882f8efa98fc8320d7c0296095718ca3ed9846cbf04212ee99fa36dd8de610ffa0a757cb36d9f5c879653d01fb42d4 SHA512 02dfb22e3bc4044270d1828b6df5f772b42fd06f8af0ddaac07ca34068651da5718cb13e2c97322d7ad9f2099e34bae7f5a18ca50a1c79a9cc577d6a3eb835de
 EBUILD vim-core-8.1.0412.ebuild 6636 BLAKE2B 64e3ba609a0406f60155721cf63cdd76728c0af844eae5cfe3791e8f713156ed28aff0e74e6adb00a335c05844aaf3c2d6c7f655cd91ce48388885ed7c71de7c SHA512 408da952f378be9b70bda9373df51d3a1a060e9daae80caae4910453e82fbebd0dd726ddc1b7b5bd417b28018fe0233213d84de86e780076022c3a555488424e
-EBUILD vim-core-8.1.0648.ebuild 6935 BLAKE2B 67f9453359597219724c08b966882410619dd7cc5d0a5714261e2382356a49910c72d95305d579e013c863f945d2b6fdcb46fce6adb54c74d6ec92d372089290 SHA512 25494e19981440088649978ac02b2c6a58a67c95e73b50a957ebcae781c7f30717b366bc6bd51fc82d18642c394a31120f58adebfbc9eb302ea868db98e28ba3
+EBUILD vim-core-8.1.0648.ebuild 6934 BLAKE2B c687849029c7e73199f71834b774b8778e32ea6dfd14d5ef6f85aa7becdead323e86908ae8eaf7fcc42e2d6fb9380467f995c92f23bb2b49dfc9515b26ea07d0 SHA512 68e92df938d3cf6f345c55560020416e3d900e00fd9e491591ef63cc0ce33192948889a78426d7554fba3f77c00056a7f1ec50d4b06a46044c9f0c8508f6f829
 EBUILD vim-core-9999.ebuild 6941 BLAKE2B 405441d760363078761bd3278975b38390e67797fc671ce78c8ffc61a15b43467d8c9b4fe2c640b4e792e47b26c2c11801a9bd49df5898c1be28a6be6a7ff8e4 SHA512 36bc2dcd25ca3313a391f20725ad7acb2c6bf074d0a04d9d80267a620edee674d3f3dc939c7de6171ba6cab09d07a73ddedc9c74f4717f064341d703da104482
 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705
diff --git a/app-editors/vim-core/vim-core-8.1.0648.ebuild b/app-editors/vim-core/vim-core-8.1.0648.ebuild
index c4a899440fb4..cbce493e6b7b 100644
--- a/app-editors/vim-core/vim-core-8.1.0648.ebuild
+++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 9369b2110121..7830f9befec0 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -10,7 +10,7 @@ EBUILD vim-8.0.1699.ebuild 8781 BLAKE2B b03fe734f6acb466b5573d4dad7a36f5415c3c8b
 EBUILD vim-8.1.0034.ebuild 8781 BLAKE2B 8a40f45dc7395141259e1cf7339c815a3526159181f8c3d9e61e451fd743593171bba5ccd58251ef4f57bbae45457c2612bb4d52369bffb3ac672276ce662dea SHA512 7f45c30ad45f9abdd1cfb2186c021c4f203a94ec8f9dda7d5522c7688c6b803c18baab774edae20278ce726e5eb2368cace3dd1ee79fb7e8e534aa9e6e14e6e8
 EBUILD vim-8.1.0412-r1.ebuild 8810 BLAKE2B d3054b24602947f829bf3bae1f10e8b2acbf5a05eb3fb0fd7f3da589177ceeb54aa75124521229c343ad8bd747ac2e8450dbf9d7f22c91cf24f1130e639bfd05 SHA512 691a483673566d53b887159d094113758393b01347362e26601cbda91693ea72906bc2a346fa2d1b7e709b6d47428a95b53550580ef5ab9cea7d43327683c374
 EBUILD vim-8.1.0412.ebuild 8806 BLAKE2B 23bdf54e6bb94d325be60c6512fe7f750bfc2f0073c566d5db499179bf70b8590f9ceb494cf41bf25cd88f6f647f199dfaa8431e6d61dd17860b5b6e06a15d59 SHA512 227b7214e1301312d98ae6400f0a53351e95ab902c46e37aede8496d67f879bed70ba47f403842374aac8e520d2d949e7656706a99734d8cc63f77d53cc54dce
-EBUILD vim-8.1.0648-r1.ebuild 9177 BLAKE2B 999d1bdc00aee85c3be59f84a8621a3875c96ecd5cca657307f9e1c402d082ca8294890af7fe369432952ff48fddd393670f5c1056db8eb231ae88269e26f701 SHA512 7c4f813222d2278f61910ef3bb91ada0ff46d35b61931b8b27168d5a1113652950a497871712e04785854bfee4e00f8fa1a11adc965acfc5466480043df4d8fa
+EBUILD vim-8.1.0648-r1.ebuild 9104 BLAKE2B 60e055fe0726556ec34d230a0f1afb49d16c6ee25e67891f5a2e54a3ea23d3de7020473487d8b1886af5d0afa9c7e77e2d8208415f34fbd80892c414d01af4ce SHA512 c2156c51b2cc328c414b1a5fbf3cb571c987e1a9289662309d022b507205d32ed4ac86865c00d2233cadaf602a091235b463e075071b5729565a004040fd8881
 EBUILD vim-8.1.0648.ebuild 8948 BLAKE2B 91d49f14f1fd082b005a509c4a10344052dca1e05761c9826430c901cf5b62384b820072f6bc37e1de3d843422e60c464abb075e980fdf009c0806ff3438e916 SHA512 6ab336ae1fc086cee90c867fe803752590965103dcd3b651bb700d4901917e23da9eb1d3b2cac2b2da7fd25424f1f623c72fdfcd7683b9afc80fff7ee226f1c7
-EBUILD vim-9999.ebuild 9183 BLAKE2B 5259757a6da8a271392506491d0ae5caec4c21026d64fe2954fca159856fecb073907be2a83ac7c0b1e2aa8ee40190b072090e66fb9d2cb19204574d07cf0ef9 SHA512 e0332f18c2ed724a311d01cfb537f9d855066e8128c2891a9e3da704e4ab1d4755826ef478cec397eeab2e355650b33e1648880eb5ffc768a8038a4bac2aa956
+EBUILD vim-9999.ebuild 9111 BLAKE2B ad0e7f1882db6f62bfbba923c824519bf3b55863b06f5d273365794ab3b02a802cd00d6955282c0d2de99f646cdff33997f13ac1f3a3349fbebe352c81893979 SHA512 8373392fce198c65f61e77cefb7a6fff10d21191c98b4451cac703c5430b4780fd6c9c0f341a6b756917b24ae78f99dab36ed3ad1a2947ae3028261a00f61f49
 MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53
diff --git a/app-editors/vim/vim-8.1.0648-r1.ebuild b/app-editors/vim/vim-8.1.0648-r1.ebuild
index 8ce3e2d1c2ee..3498e851ff43 100644
--- a/app-editors/vim/vim-8.1.0648-r1.ebuild
+++ b/app-editors/vim/vim-8.1.0648-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
@@ -27,7 +27,6 @@ IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby seli
 REQUIRED_USE="
 	luajit? ( lua )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
 "
 
 RDEPEND="
@@ -58,7 +57,6 @@ DEPEND="
 	${RDEPEND}
 	sys-devel/autoconf
 	nls? ( sys-devel/gettext )
-	vim-pager? ( app-editors/vim-core[-minimal] )
 "
 
 pkg_setup() {
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 08ce8d409f49..7f5fd67a23ef 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -51,14 +51,12 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
-	vim-pager? ( !minimal )
 "
 
 DEPEND="
 	${RDEPEND}
 	sys-devel/autoconf
 	nls? ( sys-devel/gettext )
-	vim-pager? ( app-editors/vim-core[-minimal] )
 "
 
 pkg_setup() {
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d9ff5c3caef6..496107d86e7f 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 0e76cc928e2e..a0d4039447ab 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,8 +2,10 @@ AUX containerd.initd 733 BLAKE2B dee4f7bad7250a1c8ca87b3b862d73f9150d73dd2b719bf
 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
 DIST containerd-1.2.5.tar.gz 4871876 BLAKE2B f8652d00b4338d0f4a1d77d452a46c316cc38b57f2df64fcfcef463f10d030f363b54f1a12c4cb32d9010872c688a75ebc1d481439dc3eb84aab193fc80c9bc0 SHA512 b249d5bfc0c1f884ecc1ad4544f9440405450c31f11e80ac094bfddb7a6660e950116114e563d7655e07f888f2ff62f4476f2b178f4e0e2acbbb9fb84a243b25
+DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
 EBUILD containerd-1.1.2.ebuild 1446 BLAKE2B 73aa0c89b0899a9c6e241aa2fd811b6028aa715fe227209f7dcd1f2da481cf16d2fe955c1cce35f43a6ff9b85f89d6ab23ff1a1abd734786fc2eaffc1a908b71 SHA512 ca80fe6078f715afd01ebda4d99bc1d00f168908850d1e03830fa6df266dd1203ffdbcd5f17f729470df8333f64fa0fb6d00b94d8c8b92645dbd82a8d75a73a3
 EBUILD containerd-1.1.4.ebuild 1447 BLAKE2B 41f551cb2d004dd3b22014b88549729849b840104c573373cfd7d964f0c6f8876771930225c2fb58ecd17e98854cb050ce91eef66e83201d0d6522b4250d21bb SHA512 be79eade0670b9701670953c552d4452e583284acf3f721d22992ada3f2e55745fa85cab1ea102b5d68d709320f1f44207b43c5ba473ef8e2951ea0ac07c802a
 EBUILD containerd-1.2.5.ebuild 1438 BLAKE2B 3b7c9da1e9aa7ec24702cc06e9c1afd187d009ed17f3a43bc46c89db9bd48650041beaff9f3ac609c8cae1ffd0cab8179f98e6f6366d6545e275405dd0982d25 SHA512 7e79fd290f74fc80663e6c9da11b09e0b96eb3c424744e9399cd47f1b42e3015da2822c75721b1224da3109a257f9286e221bb0345940ca8dccf1d259120eb71
+EBUILD containerd-1.2.6.ebuild 1439 BLAKE2B ede4ecbd54aa98608108a894ed52f041d8e46cb07018a7b085310b46613b540effb2b9a683cc68bc234555d82e331e220cf3bc4a9d08ddfb8feb0d14103c3bf3 SHA512 964c47f6101a6d7b500127c37e3738ae3d945883efe7bd524156dde9a63a645df9ace3eb2e4fdc72e77bae93fa9626bfa423236a52dd68847cc03ac06255e299
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild b/app-emulation/containerd/containerd-1.2.6.ebuild
new file mode 100644
index 000000000000..104f01bd6889
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="894b81a4b802e4eb2a91d1ce216b8817763c29fb"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc6
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/*
+}
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 38da9f6573ba..174a07a9ccb8 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -18,6 +18,9 @@ DIST install-crossover-16.0.0.bin 197872657 BLAKE2B d500ed4f6a426154b376ead6c2b5
 DIST install-crossover-16.2.5.bin 198336730 BLAKE2B a11252dab552846fe0a1527cd59cd62907142385062b744591cef6707213d03945879fc5da6bcfaaa315967c51ae15159ad14d8519407542b82f0eb53c5fd02e SHA512 17cb711e7257f094e9ccf939edc1ca6be362f18b86078fe307b7e1337850e182d02fde087789f13ea2bf96ca89736f941c1a7bd93ff1b37a78fe8f846a1d5e22
 DIST install-crossover-17.5.0.bin 198287744 BLAKE2B c594192927874e5a80626ad110f0089f2bf8b7385a16ff7755923d63ebb0559b1aa505ec4e8b6f85253ac13736b7f9af178c64ed042a515d31cd4565295db163 SHA512 8592d2c91c437d62d1fd5fecf6230eeabfe56c38f49ea795bf4d3b51d8ae4399f1b01801d60dcccb94caeb4dd662675c2739f730f39ef178db32dd4f72182197
 DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf26144375dd559bcd58af3ef05364cfb7a00b8cd68d879e6ef31e92b165876e4c3f85ebcb823dd6585c3edcb8e4cafb76d8e59 SHA512 d1e41c5290c56bbb23a6317e91800d7c23d2b4389ebf08ef4416718103aa06b05b33c655d3ef413fe76773dd3599d8fe3d4ea64274fcc18518923990f980bf2a
+DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
+DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
+DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
 EBUILD crossover-bin-12.5.0-r2.ebuild 3835 BLAKE2B 8e6207e5aa87368e5ab419382c1158e3db9eab0947ba095675d31860216c83abe15ce2f6207f22bf4b2e7faf5aa6ed6f184ecb5d6f4570c5b881f7f5ff419bba SHA512 cbdf323454aeae3ffb3246df4e1521e3e22d1d24be8d7cc9308df4bc50616e523996f7d809913fc0732c0f4f2c5b559c20d5ad00871e06724c33ee53798239cb
 EBUILD crossover-bin-12.5.1-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
 EBUILD crossover-bin-13.0.0-r2.ebuild 3836 BLAKE2B c9e5479945861bb663c5686c9010a4cf5e49f2716f0c0b2f1583764c988bdcfed2a67717a2036eac036798f93b4c5ad2aa2e54f56850142c9062f9bc57da5850 SHA512 7386643f76491d010406b3f818ba9143d88e6d6b8a624f26f7723001a429ff3f01274bcfd22c322ec109cf0b3a10a1f503442e4172c26a824afef0a5136b4f72
@@ -39,4 +42,7 @@ EBUILD crossover-bin-16.2.5.ebuild 4850 BLAKE2B 83ac48b39cfc5cf654110ab13ca2a178
 EBUILD crossover-bin-17.5.0-r1.ebuild 4726 BLAKE2B ce87b80217b5161d2abaf681c9348ae519bbf4547bd0405627b74cf02414e1b3f347afb0ff9f075b14b8fbca65526c54837acc849d8623d4f10a310d5a8818ae SHA512 51acebb632d091cccb09686a9ce9fdea67fcbbeb2054ae63b48a3fe7321f7036d93d143124b4023a3e76003bd4acff57856d02ec7af478e5ae95f7f5dc2f7282
 EBUILD crossover-bin-17.5.0.ebuild 4692 BLAKE2B 17c98f5a466f223710cd3d9245fa42138354797a1a8dd7dfe6ca1d943e4fe7775884f93a99c472ead60f08f8e2da7ddfe25dcd2ea5a0718a89b51ab5a3566f05 SHA512 b0f161809b491d4ede37c250af2fab225c2c7f574d7bbb4a13fc70037d46561074573e46809a0f28952ad77cc2726b6b9bb2f62acaa8c138c05e1293601c3fcc
 EBUILD crossover-bin-17.5.1.ebuild 5240 BLAKE2B 2cb2a64bab5581cec4f1cab04c73775059b2f2c4d7ab3b4635204a8c1649ec7df9a615f9fb910e74901c48e27ceb6deb17cace229f8b638a7fbf31403b296c9f SHA512 26c63fd19ab3d231d5cadf737c7c8864fac798db820a74cd21e63e0d48c2b789b75bdfbada6edd6124ed74dd62130d95db48e932813e09f21ad7ecf37bc5e18d
+EBUILD crossover-bin-18.0.0.ebuild 5447 BLAKE2B de2e61af0f154b670555bfe3ab39f4248fa0c5705778e03cd05481a59fd644ed68228726a1fb24f9783a6b196d120c58fe9e42e4a7be444983cf0f3d9cc48c8f SHA512 8d27656550bf41965bcfc750230b76d9ab90e08c7b88ec20549b05a902a6d6ae7af84ca7997d8515b2c5acaa1b9d5b3ad455908debf21d59f95e09e6de7dac77
+EBUILD crossover-bin-18.1.0.ebuild 5447 BLAKE2B de2e61af0f154b670555bfe3ab39f4248fa0c5705778e03cd05481a59fd644ed68228726a1fb24f9783a6b196d120c58fe9e42e4a7be444983cf0f3d9cc48c8f SHA512 8d27656550bf41965bcfc750230b76d9ab90e08c7b88ec20549b05a902a6d6ae7af84ca7997d8515b2c5acaa1b9d5b3ad455908debf21d59f95e09e6de7dac77
+EBUILD crossover-bin-18.5.0.ebuild 5447 BLAKE2B de2e61af0f154b670555bfe3ab39f4248fa0c5705778e03cd05481a59fd644ed68228726a1fb24f9783a6b196d120c58fe9e42e4a7be444983cf0f3d9cc48c8f SHA512 8d27656550bf41965bcfc750230b76d9ab90e08c7b88ec20549b05a902a6d6ae7af84ca7997d8515b2c5acaa1b9d5b3ad455908debf21d59f95e09e6de7dac77
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
new file mode 100644
index 000000000000..f193cab1f49c
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	app-arch/unzip
+"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
new file mode 100644
index 000000000000..f193cab1f49c
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	app-arch/unzip
+"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
new file mode 100644
index 000000000000..f193cab1f49c
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	app-arch/unzip
+"
+
+RDEPEND="${DEPEND}
+	!prefix? ( sys-libs/glibc )
+	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/ncurses:5/5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 43e5cd819792..8e537a619cea 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -3,10 +3,12 @@ DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 6214ba714ba8b0121416817
 DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B ad1fc76347058610e2cd1659fb89f9990cc704c3a31006b976e44f31a30e754ac86e7b4823c48461cdcba948bb8d320ae25eac1e13b26f1fde072343251a61e0 SHA512 603ad154d0987a021dae69d542fa82a53b8d25ad9b44cf16f0ef551e0b81e0174dcc73b3a8e9ba89ca1d209f0022e767d44a8350b00b9b4e252cfab698b1d5bd
 DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3 SHA512 9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
 DIST docker-proxy-0.8.0_p20190301.tar.gz 2703026 BLAKE2B 0d0da49e1daf260c5d5699cfa8dd447cd6fe83f5903834aa065af52f133910d1f16a06ef7688340d2068e5ac544de8b1a2b9644f65af486077b66d56efd9447f SHA512 8ffd6fc97df4b63b1f83a5eb6d8e63c8c413bcf3e2ff82f507dbf875d0df6903b6fe1546d8625dd3b4681d611aed4702c423d0d5c9621ed57073cbe16bf35200
+DIST docker-proxy-0.8.0_p20190405.tar.gz 2703481 BLAKE2B 7df4333c0d5303be5819faa1e984cc516df21d197b08f07fadbe7800f6035cefbeea6a63bf0cc7bca0a23cf324558d0422638e15c7750877fa4fb589e4052ec4 SHA512 a24061cd29c3c9852a435f742e6653da48edd419205be18a37d065b50c2fbf005bfe62a1f909b91781f521b70cb3a9639a4a67e8563e2e39e6dd22f1c7bf82b2
 EBUILD docker-proxy-0.8.0_p20180411.ebuild 828 BLAKE2B 40c072624b54c218816132f4d3b71f29e2c4d1afbb20d6be0fc518cd729b3453ea12839143d3ee32e3ce810b8650316fe718ded9c5a950b0ee9ef372f4c2ec20 SHA512 4a018ca6462c3aa371d7e02717f805d1ea5424629892d9e69c7843fb4572da68f2d23eef0bc094487ccb3212a34799541b805c00a0cf941c114140ca44ab8cc3
 EBUILD docker-proxy-0.8.0_p20180626.ebuild 825 BLAKE2B 256ce2df79ece0668908db8d64ddfdb6737ce6d1ba7ef6e7a8a4b8c16af057d7ae81b75b3b3e9a6b93adb2f874f7563839f6bd343c00c88ac0ea4ff0bc5e5bbc SHA512 e211a3ac5576960377b5de1b164b5238243a215a50a76358aae240d221c160d013f85304909cdaec1db9719ab92bfce03b1afa71aeb9fae2930fc844438ffc46
 EBUILD docker-proxy-0.8.0_p20180907.ebuild 826 BLAKE2B 19c2f5cc5094a1f47b2bb97df327902c3173f161f71e55540be7a2b60574567bed7e1739913f0331c120b4e6e66c791f8e79dea7e020a9523dad5882cac85134 SHA512 226a6faa9ac793eb9144741bb4853ec14d0f86df61c56a3610df7439b9f693ae3024c4b5f749378ce24b79789f0efeb181726057ed86f1206f7b0085e469260b
 EBUILD docker-proxy-0.8.0_p20181207.ebuild 825 BLAKE2B ae4d246ed05a3cf8b8ed9d41955cb9edc9d9d530113ed16ceb4f44c02b00ac3e9a59a52f7b6862c584da28e8e2fccbaf6ea5000d27f87891c6669789a575df1d SHA512 2cf5e7df32c7aadf606f53a54ce58188f32801da8f0003656120762a6ad4b9fe6e58e6648cf2a37d0c131ee2a2ae6aee1ebbca07ba556f645d2915afadbfd35a
 EBUILD docker-proxy-0.8.0_p20190301.ebuild 825 BLAKE2B 0bf7dbe59a67bfda70b0a0c01a411de64bef45cad0d24ac53f2e78206ca4b2fdd857651da83f8f220d1e2133a62f2edf8481869bc7a40aced2da55df595b8c90 SHA512 26e47320a89a510736bae74e70c479bd6da84b8d9f85007e350e9ba383ac55a5e5d753d8a0b8a4e73bcadffb2863de3511e9810f0586a50081ddceda3f1ea795
+EBUILD docker-proxy-0.8.0_p20190405.ebuild 781 BLAKE2B 1a46913f9b695ad49b31ce78e0261f62284bbbbdd02ca9cb8dee0173466136a7971ba87b53c8cc33cb98f1f9a203317c688577bfdc346056e359555bdc045caf SHA512 8a4c9eea09bb19037575afdac39022e7726aed6995f9e49b0e282838c04b4e04e88ee2ad0c285376b98f3858c6982b4e9ff6e546a8edbe2292cbc1fc42b6f14a
 EBUILD docker-proxy-9999.ebuild 782 BLAKE2B 9d12852020716c9fda7e8da2dac1efd32f929b4d1afdfedf186e80e8f2d1351a626833a24e01e81d0c30a9099b286051099e5065e4b0dd55f5a0b5037dbd2d36 SHA512 3b972b6ef5af055046171a6ea8c8aa8f6ec51576d0b871ccff3080d9b99a5e8762c25d3226cb24fd3db66a8f0140a38506fcc6691f0c75ddf8b2646c785d83e6
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
new file mode 100644
index 000000000000..39c8d9279909
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="c9029898e32f7c89bbb81511fbb721df252ce61a"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc ROADMAP.md README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index addca968b4b3..d0aa61754f78 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -1,3 +1,3 @@
 DIST docker-runc-1.0.0_rc4_p20180122.tar.gz 1184954 BLAKE2B faf07c06c12301588d9adb1bfd31d562b31cd1119f1247b06afb2d6eba077c37a8871bd32d48e20b79f1b91fd052ec54fe6da5ac8c51713c9757e1967db563c3 SHA512 c7b24ca6212ce500d1d4c3a1776be5ca116d4f005d71e5fe8f2228c26f039058f3dd1071e9e39aa9c93272a49f7ff2ac86e2fbbcf6115cc3de65a370127d8ea5
 EBUILD docker-runc-1.0.0_rc4_p20180122.ebuild 1384 BLAKE2B 26d60b88bbe9531176778c5fefe93a1e85ff16daff027e62bc4d145bf420f4541beee801e2daee2b96fc7aab92f234678d792be36741061be31acfaa1ac31300 SHA512 b485d24d174207b511afb878056564922f9c3fbfe0b18967dccd705930f3dd1f43b4f615abd325f30a7cde3d663d16546d5edb48d45748e953b929350504ac90
-MISC metadata.xml 627 BLAKE2B af677935e5cb5c43d3b0e4d8a204bcfb14f4b77dc386fd2a756923457ae88cdc33fd85a84879b7908662c3c1b20ce0ba5598ae708d764bd36a071e32d9beb2c8 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163
+MISC metadata.xml 549 BLAKE2B 3abe771305fac3d044ccc50d495dcbe54c1023870dd3047e83cf750a658303fda48d4944202785f37fa1b40cb568acdb92872b5f97358d2025ccb3a87c91df15 SHA512 be3fbad66b2d519eb71fb8d2902eed883a40f087d3d4b48d908ea250b55f59865d3f6f2554189f8d7372cd0b4310fdfa37f1202e7f2e781f70299fed0dad2c96
diff --git a/app-emulation/docker-runc/metadata.xml b/app-emulation/docker-runc/metadata.xml
index 9fe8126b58a3..6e7ba248cbb2 100644
--- a/app-emulation/docker-runc/metadata.xml
+++ b/app-emulation/docker-runc/metadata.xml
@@ -5,10 +5,7 @@
 		runc is a CLI tool for spawning and running containers according
 		to the OCF (Open Container Format) specification.
 	</longdescription>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ambient">Enable support for ambient capability</flag>
 		<flag name="apparmor">Enable AppArmor support</flag>
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 304ecce004d4..cd0ac9dc32b7 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,7 +1,8 @@
 AUX bsc1073877-docker-apparmor-add-signal-r2.patch 2931 BLAKE2B 92737eb582f5c2b3bc548952e20f8b9512ea3abab785280a351202878a77fc5e7c00267498ac38cd13dfb5b21a891f5be827f8f4ed234ca34bb90523cd2ebacf SHA512 f1c57585146d89be987b19ebd99a0da69d75309885e3b2a098c1b5f339aafa360c3726fe5e99a2580c98c3f036d83eabd3d2d72461d97e8a0cbb4dbc27f895d4
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b SHA512 78ab030555501071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f29444407456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.4.tar.gz 15254594 BLAKE2B 9dec1752d58e874abf13a5d6285d4318af3d147f6ae989691ce4c1df577d79b1e4b7fdb673f979d5e4be2359debeaf766018d96ac17866d656d754575411c646 SHA512 139d09829b92319f66dea692bac0664decc666d9bc13f0a85b275e3fe2cf3b7e71b7e608a519c7a7baa40626309e2d4da880bee84da19f5eb3107af55d072ddf
+DIST docker-18.09.5.tar.gz 15256899 BLAKE2B c55ef822b3e655b0bec9585de6ee346e73d48d388225141097768db9f5ddaeca2d1937274a7131e3e301686e2214a9ed2051dd72c07893bcfccb00424d02df73 SHA512 a6012d202761d6449e347b03759d92f5f45309e72562fd4a619b2a21c62b3f50b1256d2e4820317aa6b412f1eecda66dbd960d322293699433417a5f7ee73486
 EBUILD docker-18.06.2.ebuild 8489 BLAKE2B cd1ce26e248cf86bbb31f5b2c023fd73df41010f0f0953bf677df2c0c823d6ab0520ac9dc6309ad5a66de879901e6968376f3956f7d79e7c28f3b2e6b2d2eed9 SHA512 a1a2be3fc79751bd93090d128ae1f3c29a3b6cc7f887e40738c566235faa741a777a7bd0778d29e40b9fb32a78899e2f19a008ef75f0a9df5f9a89bd8bda20c2
 EBUILD docker-18.09.4.ebuild 8295 BLAKE2B 94f91564ec07f1807c3fde22d43c7f7d82a39ffc644295477fc11a5060ff1a42888a5e773dba6684b997a05f3c7cc2d8feebff8251a99b4669446adbf0524947 SHA512 0f8493f2dc08d8d4de2dd911f577c0ac57e89e01e3f337efc47d7c5de518b9f0ce0fc9c9d513bc4b54b6d8695462c6b7952575da3c8d3809588f651a8fc37bad
-EBUILD docker-9999.ebuild 8168 BLAKE2B d1111f0132aa330f95f8f9dcd5c49aee0c8a0eaa5ee3cbd567be89f0d2f4b8c230c80d817fe14272d7c2765f1877ad070ebe98107575ec0f43d10e2f6f6b089b SHA512 e629feee1e546a0ea4570692446697899199248334fc00337963eda8857fadde618fc42ad23288f4239cb7f6f71ad52a61a2d275e54a7694fd79fa1fc1610df3
+EBUILD docker-18.09.5.ebuild 8296 BLAKE2B 3f906ec2ad2fa3100d4b37bbaeb843f790bd620f8b083e3a4099a909a7c83e9bb1df1899db2e6a91e354d1db240f7ba81fc3b16c812ac306c0d8d3420464ffc7 SHA512 01b0b23ec67da9e90d79f4f5cbd62cca4d8f82488911f958226e3262017443a6c8da68e5c6e16bd4e557baf7a5e856ccfabdbd813594fa3410f9d1b53815d476
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-18.09.5.ebuild
similarity index 77%
rename from app-emulation/docker/docker-9999.ebuild
rename to app-emulation/docker/docker-18.09.5.ebuild
index 9892842ffebd..041c2af199ab 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-18.09.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGO_PN="github.com/docker/docker"
+EGO_PN="github.com/docker/docker-ce"
 
 if [[ ${PV} = *9999* ]]; then
 	# Docker cannot be fetched via "go get", thanks to autogenerated code
@@ -11,11 +11,9 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
-	MY_PV="${PV/_/-}"
-	DOCKER_GITCOMMIT=""
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	DOCKER_GITCOMMIT="e8ff056"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
@@ -25,7 +23,7 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp"
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 CDEPEND="
@@ -51,17 +49,15 @@ DEPEND="
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
 RDEPEND="
 	${CDEPEND}
-
-	!app-emulation/docker-bin
 	>=net-firewall/iptables-1.4
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-
-	>=app-emulation/containerd-1.0.0
-	app-emulation/runc[apparmor?,seccomp?]
-	app-emulation/docker-proxy
-	container-init? ( >=sys-process/tini-0.13.0[static] )
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.5
+	~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20190405
+	container-init? ( >=sys-process/tini-0.18.0[static] )
 "
 
 RESTRICT="installsources strip"
@@ -75,8 +71,8 @@ CONFIG_CHECK="
 	~KEYS
 	~VETH ~BRIDGE ~BRIDGE_NETFILTER
 	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
 	~POSIX_MQUEUE
 
 	~USER_NS
@@ -92,7 +88,7 @@ CONFIG_CHECK="
 	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
 
 	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
 	~IPVLAN
 	~MACVLAN ~DUMMY
 "
@@ -115,21 +111,6 @@ pkg_setup() {
 		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
 	fi
 
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
 	if kernel_is le 3 18; then
 		CONFIG_CHECK+="
 			~RESOURCE_COUNTERS
@@ -193,7 +174,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
+	export GOPATH="${WORKDIR}/${P}"
 
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
@@ -203,17 +184,9 @@ src_compile() {
 	# if we're building from a tarball, we need the GITCOMMIT value
 	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
 
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-client || die
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-		grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
-	fi
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
 
 	# let's set up some optional features :)
 	export DOCKER_BUILDTAGS=''
@@ -229,22 +202,51 @@ src_compile() {
 		fi
 	done
 
-	# time to build!
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
 	./hack/make.sh dynbinary || die 'dynbinary failed'
 
-	# build the man pages too
-	./man/md2man-all.sh || die "unable to generate man pages"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
 }
 
 src_install() {
-	VERSION="$(cat VERSION)"
-	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
-	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
 	dosym containerd /usr/bin/docker-containerd
 	dosym containerd-shim /usr/bin/docker-containerd-shim
 	dosym runc /usr/bin/docker-runc
 	use container-init && dosym tini /usr/bin/docker-init
 
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
 	newinitd contrib/init/openrc/docker.initd docker
 	newconfd contrib/init/openrc/docker.confd docker
 
@@ -254,15 +256,6 @@ src_install() {
 
 	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
 	dodoc -r docs/*
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
 
 	insinto /usr/share/vim/vimfiles
 	doins -r contrib/syntax/vim/ftdetect
@@ -271,6 +264,20 @@ src_install() {
 	# note: intentionally not using "doins" so that we preserve +x bits
 	dodir /usr/share/${PN}/contrib
 	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
 }
 
 pkg_postinst() {
@@ -286,4 +293,7 @@ pkg_postinst() {
 	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
 	elog "  usermod -aG docker youruser"
 	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
 }
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 4f14e5e62d0b..cf2d4d40a424 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/bind_exporter/Manifest b/app-metrics/bind_exporter/Manifest
index 7172e25f7988..4b4a9a88484d 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -2,4 +2,4 @@ AUX bind_exporter.confd 57 BLAKE2B dfffea2f2859b377d5132a2c56ace0260f2d272463c10
 AUX bind_exporter.initd 550 BLAKE2B fcb4eb3066023024b8605a2c9787ba7c8871d05d1b11a1ea97ebab91e403e21876c8b29136b114c6ceef29e9be79056accdde7061e13f615b1f55c25998b938e SHA512 1471a0644c1c2d5a242987638b6fa0576913b9dfbcf886ade42951b3cc71f632c210060a619637988c5239a3ff934c2073e2bd34b913abd9871eb028fd71e2e1
 DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d
 EBUILD bind_exporter-0.2.0_p20180307.ebuild 1550 BLAKE2B 5448c9f30f97c14a72f8063af4b335d5ea34f092d6c07adc5f27e72a366acccaf437b5c83a74117f9ce2f55fc6823762d587e823615745a004d38d85d201d09d SHA512 f94d6e633a3fff0c9b1b84e4ce3bc4034abce0519dbba1d332f54dc188278821e874d4e32323aca926d01e2b06c7506378e0318d1acba22f1a66da248cc5d6c9
-MISC metadata.xml 336 BLAKE2B 5b39247fdfd604232cfc3025e79ef77b109e9751e5eb2221da402420058a2b54686030592b30f6337575e5d6fc7f4080b46afc133e06ca4c48408b15bfd550e9 SHA512 e66208ff143de58a4a947c7de9b1ef414211dfd68ef5d2b18529c5b23252941bb32208cd6747cd5892d01986eb4a872f96083ee8ca166d322d8bdcdbe998c7c1
+MISC metadata.xml 258 BLAKE2B 3e1e1a99e20e0e84744b82650f72b24662b588dc603d95d1b45258f4f0a3bfba11aa1322672adaafa0a4f505f63d6a7c2a7460612c055377ad2bd8b7a0b9fca2 SHA512 6848088d8b0b0dbb9a54a50370ca7318bf8e127e1f59712a48bdf080e623dd0bc67e42c5f98356918c34d2e1caa2daab6f24bd3e74e76d09d8449bb5895cfedb
diff --git a/app-metrics/bind_exporter/metadata.xml b/app-metrics/bind_exporter/metadata.xml
index 202de383a4e7..4974e7b5d62e 100644
--- a/app-metrics/bind_exporter/metadata.xml
+++ b/app-metrics/bind_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">digitalocean/bind_exporter</remote-id>
 	</upstream>
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index 5948533e8df5..89b32d7b4520 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -6,4 +6,4 @@ DIST mongodb_exporter-0.6.2.tar.gz 1296198 BLAKE2B 4cd04b5e69788f2bbe3e87eafe6a7
 EBUILD mongodb_exporter-0.4.0.ebuild 1110 BLAKE2B 5ad73d6b2c0cea692de28c2bac400beca74be721fe4c0766d8f12fede1f598e45f91f29ef001ec21a72a25884a2bc789ed51771ebeac751d63d22de4316e0b92 SHA512 75956d5f16c5723cfc2e2f7758f4645d87d6539bd8a3f5dbd0244d1985ece9372df28d9747ffec068c7bb352fc236abc25f0f0edea66e41c5d9477ac6ac7d581
 EBUILD mongodb_exporter-0.6.0.ebuild 1068 BLAKE2B 28d809b53a9501ca8b67d939351ac84a6b264fead83dfb5f985470a69ae9d8337521e03a83f1d633612f5813ba59f11e28b76623db9929bad55b881a86d6276e SHA512 f1c4119c210821f893df8f4bc4458c73f51031a513718d21dcf0bed85e72b818d34c40323068ade2d91020ecd72337aac0ae0fdf44c3a73b6e6dcb65fba2a8f5
 EBUILD mongodb_exporter-0.6.2.ebuild 1068 BLAKE2B 28d809b53a9501ca8b67d939351ac84a6b264fead83dfb5f985470a69ae9d8337521e03a83f1d633612f5813ba59f11e28b76623db9929bad55b881a86d6276e SHA512 f1c4119c210821f893df8f4bc4458c73f51031a513718d21dcf0bed85e72b818d34c40323068ade2d91020ecd72337aac0ae0fdf44c3a73b6e6dcb65fba2a8f5
-MISC metadata.xml 334 BLAKE2B d5ba9240caf276981ccc375de2ff7d205b0a04bd58903fa60a486d26cb099f5c32d1921fcc433b091bf30fddf20196deb8dbfb3f5e76cffe951cf170e79d6202 SHA512 e854872327de5d18b24ce3b6d5f93f35e44f4cdff88018b8e7aafdc1cdc4953820ef855b5d1be1d53dd8ede67119399c39e52fff04fe928ba2847467cbecf613
+MISC metadata.xml 256 BLAKE2B 61aa17e78f6de159d61992fd9bd136f0ae751cb85cd8728031408dc8fe1872c746620fcd34604770332391bbff81f34aca135b30d8bc5b558242a71d4f3bcd25 SHA512 8f0c6a1845a873568e14f9032658de049b0c255c91b5fe31c8ad6e9d53bb1c009083d7bb75ffbd86d7b69fc09d8a8775fd65cda98c47698f970dad85e346a848
diff --git a/app-metrics/mongodb_exporter/metadata.xml b/app-metrics/mongodb_exporter/metadata.xml
index b54031048cbc..5857176f4249 100644
--- a/app-metrics/mongodb_exporter/metadata.xml
+++ b/app-metrics/mongodb_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">percona/mongodb_exporter</remote-id>
 	</upstream>
diff --git a/app-metrics/nginx-vts-exporter/Manifest b/app-metrics/nginx-vts-exporter/Manifest
index 1e05ee82aa37..fccfab62eecd 100644
--- a/app-metrics/nginx-vts-exporter/Manifest
+++ b/app-metrics/nginx-vts-exporter/Manifest
@@ -4,4 +4,4 @@ DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954
 DIST nginx-vts-exporter-0.10.3.tar.gz 149578 BLAKE2B c73a8cfdb875fcc02d3b7d66f5b436b9e3e8d516c8a241062721e3124452722e9e30abefd5c79e89772a480fad005d0cf25d0359dd253a39d7ae5a20495f074a SHA512 0ee97be313dc829ae9e23bc836d7e11106c4843306583ff8baa38fa10bd9d56396ae3f6ce12cad4e08a383047c3179013962284aef6e627b23b89c72c564789e
 EBUILD nginx-vts-exporter-0.10.0.ebuild 1120 BLAKE2B d1200212f0ae09284a27b18826a49d3a30e55334d7f55e48134d4d6cfb704fa27ec95f99c5e8d5ee8a5c40c5f92bada71092d6b2c1e5bccdd58ac5fc1452e274 SHA512 871899a662d4d6b4c3b36fcce440cdc5ef57abf36016b8d0f535b0fb3a3e78adc71aff16ffc314cc1ef99167324aa1230dfe423bab0ffab7def00650f28842c3
 EBUILD nginx-vts-exporter-0.10.3.ebuild 1120 BLAKE2B 34e05f1a24e62e1c036ef50f0b0b8ce2256bc84f27cc5961b5b035d3d41d7194a503337b96bc90b4a7f92489536e8e48aefa97212e78883894fcf05882082114 SHA512 f02831085bc7462d9953da0135b632dfa86e2e4900a6e6c186d60c54facfc0b5baeb66a97a4720cf94cd6a61349630d4d5d8c686d6ad1578f552c1de0ef4a807
-MISC metadata.xml 336 BLAKE2B 1efba2e3d984ebbd079fe45c406fb14932d9eaf9275e25b62fd915c6e9216fe2af377808436f66a8f0e3167126c1dbd2667021e155906e1e880a03ab1397b9bd SHA512 4f84f5262f71494fe5edbc2e1ffd96213f856f317c732f8833a865fa8bd4ea8268b43134e5f0dbcb51f18c3d52203b9000fd7afd346c68d631c5c42d2237917f
+MISC metadata.xml 258 BLAKE2B bd20ec1460d7fb49c9a758a9078a7780174ac04050f32eec89ddba7fe5d41c7fce50cd05cc2e1eb1ea1fb2b0eb33ea567de59b01d0711781f4c297098fef93e5 SHA512 ca87b9d1e5ff8a727d456d982206d9fbd0c7a6d8e6b3675e6aa5f906e1cd0b67fef1fab7c21cf0316850850e221039e929ce4060e3a4748d349522178aa3d1a4
diff --git a/app-metrics/nginx-vts-exporter/metadata.xml b/app-metrics/nginx-vts-exporter/metadata.xml
index 0baff3eb9512..84e9178fec4a 100644
--- a/app-metrics/nginx-vts-exporter/metadata.xml
+++ b/app-metrics/nginx-vts-exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">hnlq715/nginx-vts-exporter</remote-id>
 	</upstream>
diff --git a/app-metrics/openvpn_exporter/Manifest b/app-metrics/openvpn_exporter/Manifest
index 82ece2fb295e..422fab047198 100644
--- a/app-metrics/openvpn_exporter/Manifest
+++ b/app-metrics/openvpn_exporter/Manifest
@@ -10,4 +10,4 @@ DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.g
 DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
 DIST openvpn_exporter-0.2.1.tar.gz 10126 BLAKE2B 06899bdc151232b6588e865ccdb69c4cc0b4f618de8b8d03240d72c7fe2acade2c65b60597f744936c19c603da0e0f924b8910a5898349a42884f91deb882e59 SHA512 9cbf859be78337e15c1e3ba0c2dc687afc18b4879af68b7b9fe823aebb415c8b430aedb7e31ffdd1685c582632db1427504a1fb874aac49c8ef11df4345ecca1
 EBUILD openvpn_exporter-0.2.1.ebuild 1537 BLAKE2B 54cbca7bc2b9ba49ed8dd4bee3e146a4248cc24a91a23bc69a92dbe35aeaed5a1620e50ba08daf5e03a44f621f82766437ad8569f23d3b4f8f1f70a3375ac875 SHA512 d6129d579226e17ba150d9e767c8d28ef1f87411415bb51aafb349469709a5965c49c85ebefa56bcdc8e84fe7ee596a8547d3de3678c1f304f22bfc7a17fa290
-MISC metadata.xml 333 BLAKE2B 8684f88c493ace77ed6eb36b86347bb52c64f09513ba34ce58ac811a770ea96df8c3a136bb9a8d06be4aa63b2ffd562f0251cfa6c5e7ad2cc099ebc3277093e6 SHA512 ce15fefbc0e12f6e720fefa0e4a1a243349388fcbb96ffdf7e20e30543a4899b5bb6add5d7aef4a99f65bc1157689432c894ce65f92ff794486d8ae9653fd227
+MISC metadata.xml 255 BLAKE2B 6f57419119983e5e14d4300e02de7f4c7dbe08cdb79a9562675417518e92de2a6ac16a1a553c4b1c83cd451e5df8da68d37afcfac5017ac4a4ee56b473f893cd SHA512 98072789b42ac8c9e0b62535ce41e164c615b06543ac24f1f24d6d2a83c548fbceec4c01fba7d095c7a1e6499c9f41bd11c12727ab9b235ef8f569372f9955a7
diff --git a/app-metrics/openvpn_exporter/metadata.xml b/app-metrics/openvpn_exporter/metadata.xml
index b3817548e304..e8914fbd6b33 100644
--- a/app-metrics/openvpn_exporter/metadata.xml
+++ b/app-metrics/openvpn_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">kumina/openvpn_exporter</remote-id>
 	</upstream>
diff --git a/app-metrics/postfix_exporter/Manifest b/app-metrics/postfix_exporter/Manifest
index 2eb5a9b4a2de..5d052d65b69f 100644
--- a/app-metrics/postfix_exporter/Manifest
+++ b/app-metrics/postfix_exporter/Manifest
@@ -12,4 +12,4 @@ DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.g
 DIST github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz 56873 BLAKE2B 31ae12d51b6a28c285bd5854b137d2634499d0db3c2c65c0404ca5a902ffec2e9bf689261ea51c2fe1643733f09a780c437f7a7899a5e6c3e3d100a36e07b897 SHA512 a548c6bc71456c9878cb34ad1514d92c8737e01b555e953f848cc1ae7944424b06a14a8ab0c6de4d99dbb189a0f29e2bb9ae09b5adffc327c28f5c50c2819892
 DIST postfix_exporter-0.1.2.tar.gz 11552 BLAKE2B 987c81482fc984e8f6c870fdaf7ce2ef67b3fa66e5782713a645d35b76a1bde1dde97a79705569d1423a9356309d0b7240c77dba386127e8a5035990220d2a62 SHA512 579793281dedd858538ab9a931e0003cfc9989204ebf4352dd4860e5a7f62b919d77a9e0facb9daff6706771010f9e807061dace8cb88928635d55111c7c482a
 EBUILD postfix_exporter-0.1.2.ebuild 1800 BLAKE2B c4fea274cf1304c29cede6c6734bcb6495c2ca02caa30babcc38c2b23e6c538855009233714cfe69821556858ea7ae5aecfe1c87c2ee9da55fe4bae467324926 SHA512 18552e1caa8a58b84bd91750c1255ce2e93d2e5bbafc2b894c8716a34779660b70f439229227456352c35d5959c88d4ecd322ca24dc730f1365507981701c2fb
-MISC metadata.xml 333 BLAKE2B 18b452d84f05bd66d189db30b177d2696e40679c1470c1cd2947066adbe436db1aa5695601a637682b0a50e6bdd74e6ceb9206c7748fb5cc35761822900a6b8f SHA512 2923e428344cb58904a440e1f09e804948bc1fb1457128ff1b2c0885988031399490e5262409e5bbd12bbdb1ab9a60775294a05f31f2253dc07ebf4483016769
+MISC metadata.xml 255 BLAKE2B 1132f0657024f17717e5191a4992978685715f9abb96052db6399468506deaa85454efcaf58c7dcebfe5e1cf8948c767a7b001832d50c7d9dc162b0ff1395361 SHA512 36fb59a02d322553d6bfad2deeff884cc782c54bbb01a3fb344767fb43536905c43950df368e645d08ba9c48f3ec13c05b1d3c827fa12581c164623d2c174d73
diff --git a/app-metrics/postfix_exporter/metadata.xml b/app-metrics/postfix_exporter/metadata.xml
index 7f7638315a35..a5b8db8805ee 100644
--- a/app-metrics/postfix_exporter/metadata.xml
+++ b/app-metrics/postfix_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">kumina/postfix_exporter</remote-id>
 	</upstream>
diff --git a/app-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index 5794891cec56..a461507c4e2a 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -4,4 +4,4 @@ DIST postgres_exporter-0.4.6.tar.gz 3698795 BLAKE2B 5d8a370d6f5ddbe0c8570ad14d85
 DIST postgres_exporter-0.4.7.tar.gz 3699251 BLAKE2B b4232858464ae30f714dda58a414ec343aedc5972b44066aa45a85cf64d98ef40925ca77956c218a3962e22a35f3229795cc730fec9fc10565a43fc9e827200c SHA512 81afce765830a5c16597f0ac9a95d21466edb20e40cff8e26079663db75f0051a6e0eb4ff828eb825b51a6fc52b3b534e0f6ffbb2ecf2c94e2ec8656de4a2ff6
 EBUILD postgres_exporter-0.4.6.ebuild 945 BLAKE2B 0f8ea22ff54917e578d0713ca8f40fa0f53796fa42432c22615a06057526770c03c45516f7126b491e45150ed747d99c7e8c0e04fca18c6ee17c409282d8d6a9 SHA512 52d4ec2a3f8666509ef1dfa2277085905da5fed3fda393492fc3b2960045c573dac2365404887c6a71fea9530135ae801e2a0ea3d7aa7306d2faad1acece4e93
 EBUILD postgres_exporter-0.4.7.ebuild 942 BLAKE2B a97fe2eaa63d04df76749b64a38f83cd65efa84eb9868ccfabdfde601f58509384f90df305aa9e30c5748d3e34911a5881a91c7dda5c48e4b3fb0404eb1b92ea SHA512 17b42694342236fcdae3c042df8c029877bba1ce2759e6e574217e90383160d649251c60b9f73b6dace9a1e1766d44ae45a34bbb24a0010d6d8969eff56f9dea
-MISC metadata.xml 337 BLAKE2B 79c683483a3d5f1c6d2c12885d54ff7770b228fcff132d43fcc13bbe2c54e5eae455c11c02d007f17a80e16e72b75da2708121d5704be65de15f596c7a5f1ec5 SHA512 e14d296a2b04ea3a0c49f51d340d5d3eb8d5d52ab40e635d03d6b37db62f442d3d8d5671be5ad5b0b397c95e091de0d12a5b3a169b0991d1798ef055321ff559
+MISC metadata.xml 259 BLAKE2B 1da22e4138484c1f7bfee8247821b2713ae5b85e6e5a49eb5c9792eb0147e7bbb5939a6f9ebf3eae066ceb74f8c8dd91f8245e1f9e258b7a4aa56dda51d64df7 SHA512 d09f331ce43bb316cbc5a5a2c5458cea004a82e0ee214678146706a19b2eea64a30f8a2f08c6d7062189c0eb3287b2615b750fdcfd840bed935d78aaa1ae5622
diff --git a/app-metrics/postgres_exporter/metadata.xml b/app-metrics/postgres_exporter/metadata.xml
index 201fed5c7290..5d382f958d22 100644
--- a/app-metrics/postgres_exporter/metadata.xml
+++ b/app-metrics/postgres_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">wrouesnel/postgres_exporter</remote-id>
 	</upstream>
diff --git a/app-metrics/vault_exporter/Manifest b/app-metrics/vault_exporter/Manifest
index 8b8d344acb98..7f67aa71e4e9 100644
--- a/app-metrics/vault_exporter/Manifest
+++ b/app-metrics/vault_exporter/Manifest
@@ -2,4 +2,4 @@ AUX vault_exporter.confd 58 BLAKE2B c34e7aa384449a3cc88592055f16111b5c23a8479cd4
 AUX vault_exporter.initd 549 BLAKE2B 1a8a2a35af3c851318e461176fb87f9660b5a060238cc02edde976532bb7076fcb6a100ffa196224942e30149fda2e8f8d9a0dc211e5d57fce39a8d5645b65d8 SHA512 6470aec28a3a6ffa574dfdda2947b1d16d4255d7e7921d88622043b1dfa6b756427f98c288d3437f9f06539ca156267bfba6d03c6030259281c5acda05ba4dd6
 DIST vault_exporter-0.1.2.tar.gz 34555506 BLAKE2B 53178f8a16fceca442e38a756081cca438abdd786960de3dae073f3ce5f2ac2c5d06684ec56e48a2057b4a2161a25527b41c36d3705a054f0bae37357f33faee SHA512 71941c17d7146861a09ed48289efe15143d3fba18e56accdfdf977bf4443bb650e7201a4870b63793d372dcca8f53a04131c12803f019efbdcac9e0ca8909cbd
 EBUILD vault_exporter-0.1.2.ebuild 929 BLAKE2B 6d1853fb6a00503f05b69373c9dd96b03d36d2bb72d0970590cb85ea707697aa43768c91da59226fa6222d9999e82a3c447b7c5a6a57855644f343d87a17b549 SHA512 bddd7ffb3c662a6f340740bdc4bfcd7748c6863d959708e9b7ce644edcca66c23ae87e8f65a65f63381159bd7b6abf50808484f8520e6412cb5daac75001276a
-MISC metadata.xml 334 BLAKE2B e1317e1e9dbc0a7cfcc31c70693086ef92de9580c99d693040d00d5114a7b9c662c37332a384c21bf236ea46369225211dfeed43b6899e5858be1f10231f7c24 SHA512 fe06afc02cd875a5e214ac923d8b6fb89cad9d5f5c2aa4057fe87c99c0433d76fe3eaa675ca9ac9524352a9382869fb861b19bfb8cc8f6378dcf4fc43865e9da
+MISC metadata.xml 256 BLAKE2B ea66ae41b13f60879f180ab759c5b312f2ee7811d7210cf750d7c87a8180a041714e024eee1d31f1a75d135b2e45ab8fc5b01e4b6fdfd282b875342d96345b85 SHA512 7852a6f956e1a0d1ec5b40374da17278faa67b6626080576b4dc72717f35c57ce39b188ba4a3b94bfc7301bca6524c7207fb6c8fd48946969606ed9ea8bd0fc3
diff --git a/app-metrics/vault_exporter/metadata.xml b/app-metrics/vault_exporter/metadata.xml
index 3dfeb8c7054d..4eafefdd6820 100644
--- a/app-metrics/vault_exporter/metadata.xml
+++ b/app-metrics/vault_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">grapeshot/vault_exporter</remote-id>
 	</upstream>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7c73b9c4b116..aebc666c06fd 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 6082b190da83..912bf308deca 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9
 DIST bijiben-3.26.2.tar.xz 865148 BLAKE2B 77bb78745295d414153e18491fd16faad29defabaff4ad979db7cc6e6fe075e042dd8b04d321282fbfbf163541818019bc2cbda0f8562010dfc32f275f3f54e8 SHA512 1db8c5e605b5c6a0fcd8743365a53b6ab2d986a18d501a3f02e892bcfc8ba91e9ca933b6f2a4318f71724b40f190d0ebc18eabfe1332de6765b9bca09d36718e
-EBUILD bijiben-3.26.1.ebuild 708 BLAKE2B ac47bec8f3827f1fdd307de3b2ef447572cee4902e42cb00f850d609ad3579197f81113795a5e043f7a5a21193c166a3465dd0178f059e90fcda7076659cce60 SHA512 525c17f986bb609e8e7efc51faee217ac1799ecfbb8afb5681c9f0e40f12dd22e32ae195d851e6f57a4d35c342465c13d1a72d9ef9341ebba984169162c021b4
 EBUILD bijiben-3.26.2.ebuild 704 BLAKE2B e65c95e57d73b6186faa1f357b2e1142d81b4a83b17e25d18dca179d2878f2bc5082addc7961c18934ce8e295e8d785ff4851cc113b3572d2844bcf64b224224 SHA512 2f53ede5cbfc0bc5b79ed43fbb8a7bb42194f2c5d8dc2a932b701879b2641bbfd807428cd15ca888a82095b36a28a0824955ccc8c1882cf4ed68059e4fa77959
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.26.1.ebuild b/app-misc/bijiben/bijiben-3.26.1.ebuild
deleted file mode 100644
index c49fe03f0585..000000000000
--- a/app-misc/bijiben/bijiben-3.26.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gtk+-3.11.4:3
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	>=net-libs/webkit-gtk-2.10.0:4
-	net-libs/gnome-online-accounts:=
-	dev-libs/libxml2:2
-	app-misc/tracker:0/100
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 27514c0c2370..93f7051e7ca0 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -3,4 +3,4 @@ DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce133
 DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
 EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
 EBUILD ckb-0.2.9.ebuild 1115 BLAKE2B 0baa0ffa72e1f9324fa4fa71eef92cdbfbe438f1f7a03519a5f39715930bc7ef4103c7280feeee9a2b2329d6f4ec6a128b869bb5b0fd1e78a710ebb49f52c8f1 SHA512 8a37d8d0814a59d5667de0726e6fbf4890fac2718a046027083e20339f5df69de5175b0b3b7370b3590d7751979ed688f179faf46b3bcb7b05f331fe418e9ae4
-MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
+MISC metadata.xml 241 BLAKE2B 53b81bd5f392373de9734e1bf97c56251d03f1e8fd925dc2a85ac14aef11ced9bcfaad9e469e7a1548edc92e5562b4ed631d699e1398d314320eed76446a8ead SHA512 dad8f3d5c83cf60831c21d441b8d9a1bf4941c2c5b56697ab55ade147394f83db181f3de21f5c35d8f70eb1ed80e55633489551bdb53ef27146447763b156d4c
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index cb945f500083..2a82acaed1c4 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ccMSC/ckb</remote-id>
 	</upstream>
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
index 719a3a25fe69..acc8883a3cec 100644
--- a/app-misc/faq/Manifest
+++ b/app-misc/faq/Manifest
@@ -29,4 +29,4 @@ DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 3904
 DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
 EBUILD faq-0.0.1.ebuild 1768 BLAKE2B bf175e390eb6cf4d0a125b1623dac6c8513085a82c55559c56710eddec75a139a1d68cbaccb74469acf69bf0af038344dd30e53705b7bd6d32f5ff534de2ff74 SHA512 2bbc7f2b9752397c5861b16bc053d09a46a2bf7a0ebf23f367620eed404d0a19ada0711f50fbb71d742127f260779594a60d07a7aa675459b47f73a55562bba9
 EBUILD faq-0.0.2.ebuild 2038 BLAKE2B 4d66a88e6710a29bc2fa2c9609b09f59b7393d01cba61f1c776b5cc80957bf742b84df1f77d614942f111cb4e0f39b216588ca672a330de2b36768374355c656 SHA512 b28006be2f78ed512e23e7e2c606e6298ffc314ce2c4c456393d329d8fa5175f44e4483cf354edbe05de2a60e26fd37aff1cd32ff245bf0e8cdbcff488ca9134
-MISC metadata.xml 324 BLAKE2B 4e3f348285a9ba513382c20b245bcaf32529fa44a7b9152f3f3ee99e4e730d056ea06a808d0797ff02fe0a1a38a39959ca364bf85dba177d9a6bb70575f92488 SHA512 19ca8fa72afdebb725d33ff7f0faacf4e643c4c13af81980bf96beef3f2d29614d2ea5de4a347a7b83006078ae6d23f92fe58ed25b690699478abb743670a654
+MISC metadata.xml 246 BLAKE2B d031b734e218edba4b23370a7939d2c35dd3373ab8d19f348ff8d2496df0b385aa5af4647bd9cd8c4f0294760c242e84d9e851a191a58cb879dabe6ac92e6a0d SHA512 692595d65c509eaa4ad7e3fd4f31b67e8499a0c4415b8c49fd511d63816f47047552d737d1f8c761b89a6c1050f0c133309790efccb8358886543e7b4359cad5
diff --git a/app-misc/faq/metadata.xml b/app-misc/faq/metadata.xml
index 9003aa1128ff..c6457138ed9a 100644
--- a/app-misc/faq/metadata.xml
+++ b/app-misc/faq/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jzelinksie/faq</remote-id>
 	</upstream>
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
index 292257447e4f..21c53c1b5d62 100644
--- a/app-misc/notary/Manifest
+++ b/app-misc/notary/Manifest
@@ -4,4 +4,4 @@ AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d
 AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2
 DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3
 EBUILD notary-0.6.1-r1.ebuild 1654 BLAKE2B e3d50255904169cd8c1bcc4142464a8c4eea30522e58be5fb38b7a90944a2cf72620e39d4600e8a9bdca8a96a276ce632ee812a67fb3edc1ab80d59681599a2f SHA512 bb6b3601e91bc912d0ca062832fdf067dd40eef167e102577fe4bafd560de76e4839cef92f0d207e1480a9e28c441165fad5f68157b588738c24dbf0af42f9b7
-MISC metadata.xml 345 BLAKE2B d1f59c5babe626b5a04645c4ef693cad477fc053d0730464e4b48bee515555ded5a583ca2ae246b80af310e096c334e99717af8e1be3adf692a4c9cf8f97c430 SHA512 6a57f443fe0f4e857d41a7af2658e9eac580750e7eeeab5ea6ebd5cea154c3baf74c838095c0c97493c344525d3377e3559b7c05ca5d141bdb5efda85a13eb22
+MISC metadata.xml 262 BLAKE2B 597c3ea2ec2e6106554e720aff9b70c04b0651ebf448d86468b07eef6e07112c3b66cb38296f0eb467e0442b81fcb0e72fc1ad0dcbef949cda8bf400db947649 SHA512 c7d1d7c1af64b0ed60d30a70bea37c9c60030744273c21aef968e5655cc118bcf3a43d3590ea0e162f4c97568c7483e3e86ce59de3673e451e66e62b177e060d
diff --git a/app-misc/notary/metadata.xml b/app-misc/notary/metadata.xml
index 0f3553a0a4cc..bd7fe8dd590b 100644
--- a/app-misc/notary/metadata.xml
+++ b/app-misc/notary/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">theupdateframework/notary</remote-id>
   </upstream>
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index f9df79c061f4..9b2573a1a048 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,8 +2,6 @@ AUX 2.1.8-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf9
 AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
 AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
 AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
-DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
-EBUILD tracker-1.12.4-r1.ebuild 7448 BLAKE2B b1552ee19ab27c1a2fb7ec5fa43de63f53f88da98d77772c979a4941bcff54299d991e20f432155652152d1b3315ffc64eaeed9073261c2f428c334f5f576e41 SHA512 b84d10c8f9979fe3e66007c7e20b229d181c9e1961a92aa70500c6461197ac4a976cc7849e4901107bb4aedb3195540ec12e577f9ab368ea4aa10059ddcf3131
 EBUILD tracker-2.1.8.ebuild 2818 BLAKE2B a5470ed259e2b6d7ee31ebfe11d067bb13bb414740d41c380136ac95da1df346cd7dc57fea45f2a256dd1d621fe0a0a9005ec5228abffe2dc46b6960e9490201 SHA512 02ab995796ab64a61743870a680089e25869870587436c9d3e2126694adf14e705357939825c84f980c152652032f0f4c9026e36fab97ca9e4c5180ebd58c1f0
-MISC metadata.xml 1545 BLAKE2B 1fee1210e27ad5a33c7e121372a64ed7d70c5c8169ce7b2688ff395cb56a218d53a8c5561701498d52d7772be1ce77d44275c938ad9486dc039e2f301bb14b6d SHA512 b379f0ca9737f7847ec7e0e83148ef354a56433d5fcd45996feaa86d9773c60b97f226ca21aba48aaba31f17ead8ea1922d408193328f477d58449ed3a732f71
+MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 7516a51a113d..b9ec09b52c1b 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -6,23 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
-    <flag name="cue">Enable cue sheet parsing</flag>
-    <!-- 'firefox-bookmarks' instead of 'firefox' to prevent most users from
-       enabling this by accident; it has some stability problems and
-       performance implications -->
-    <flag name="firefox-bookmarks">Install bookmark data miner plugin for
-    <pkg>www-client/firefox</pkg> and <pkg>www-client/firefox-bin</pkg></flag>
-    <flag name="gsf">Enable <pkg>gnome-extra/libgsf</pkg> based data extractor and
-  for ODT.</flag>
-    <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
-    <flag name="iso">Enable extraction of metadata from ISO disk images</flag>
     <flag name="miners">Install the <pkg>app-misc/tracker-miners</pkg> package for actual data mining support for tracker</flag>
-    <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag>
-    <flag name="playlist">Add support for playlists</flag>
     <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>
-    <flag name="thunderbird">Install email data miner plugin for
-    <pkg>mail-client/thunderbird</pkg> and
-    <pkg>mail-client/thunderbird-bin</pkg></flag>
-    <flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag>
   </use>
 </pkgmetadata>
diff --git a/app-misc/tracker/tracker-1.12.4-r1.ebuild b/app-misc/tracker/tracker-1.12.4-r1.ebuild
deleted file mode 100644
index 1e40f5389097..000000000000
--- a/app-misc/tracker/tracker-1.12.4-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# seccomp is automagic, though we want to use it whenever possible (linux)
-# >=media-libs/libmediaart-1.9:2.0 is suggested to be disabled for 1.10 for security;
-# It is disable in configure in 1.12; revisit for 1.14/2 (configure flag)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.20:=
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/gobject-introspection-0.9.5:=
-	>=dev-libs/icu-4.8.1.1:=
-	>=dev-libs/json-glib-1.0
-	>=media-libs/libpng-1.2:0=
-	>=net-libs/libsoup-2.40:2.4
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-	virtual/imagemagick-tools[png,jpeg?]
-
-	cue? ( media-libs/libcue )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib:= )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( >=sys-power/upower-0.9 )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8:= )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff:0 )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-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() {
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# miner-evolution disabled as it's incompatible with current eds
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-miner-evolution \
-		--disable-nautilus-extension \
-		--disable-static \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-dvi \
-		--enable-enca \
-		--enable-guarantee-metadata \
-		--enable-icon \
-		--enable-introspection \
-		--disable-libmediaart \
-		--enable-libpng \
-		--enable-miner-apps \
-		--enable-miner-user-guides \
-		--enable-ps \
-		--enable-text \
-		--enable-tracker-fts \
-		--enable-tracker-writeback \
-		--with-unicode-support=libicu \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		$(use_enable cue libcue) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable stemmer libstemmer) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	# G_MESSAGES_DEBUG, upstream bug #699401#c1
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym ../../../share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym ../../../share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9c5ad4138aa1..404a31449a0b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 8b97b3417de9..c8984eec6859 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -4,9 +4,11 @@ AUX gnucash-3.4-test-transaction.patch 1157 BLAKE2B 41e516e6cf6f29ea3c41b7dc464c
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
 DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 478d8e2e4acbd0725ceaf997a1e62ba3875e9d4a003e8a3e69111a9d29118447fb2da8ef3e5dd5274d83a3adef1ee9f4a153cdfd17cabe69864b53bab8c7e813 SHA512 4cebef0ba70e59a82d3b2b7b0b138ddb22e8866dc761e156ff1f15920145d12923719effef21ad4c65ccd62fbd14a1529cf0bfcaab70c5b33d103761d08062e0
+DIST gnucash-3.5.tar.bz2 13766397 BLAKE2B b840fa6af719e1d21daabd8e26f7026a12ca9cefe8c0f644a8382b42c34a6dec2dfc67350645437c2f12792518f289f446824a8c99ea83453e69d976c3cd5c9c SHA512 76230d2fe1ba4cc605d0d58976ed3214b10a2549fc7eaa1e327bbf85c861baa082523c70ed088a59bb56deb6af9a7808752fc719eda0df3e9209cec05c9c8d13
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-3.2-r2.ebuild 3959 BLAKE2B 37cdc89d7db8903b4b89332d7f9b47cef47fb29588a443b979a49d43bad5e883158a939898368afc02cae89402b25a7498a5a373c51cb8fb9c5265c7d05c15ae SHA512 97da97ae88ed1aa564ec605d5e8d24852869745521457d98e76adbb4b72a2a28025bcddad413e2f85a2d3f6c4116c40a889438428c9c5197a873e1834077235b
 EBUILD gnucash-3.3-r1.ebuild 4018 BLAKE2B 17e75c78e4c6c9f45a36297765a512f4972670048358f745cad46a320004487621f145d8b9279ad8629a533e72f1259a39f4a42bfed501fc039b3a6e68ccbbac SHA512 66660f2357731b28a130de0c01cad1d30ea1a36aff30f02a144aa4d2e60945ba12f3847e0827d1548a9477f1f53b1293fefe28004db3e0875cce8495081b5767
 EBUILD gnucash-3.3.ebuild 3960 BLAKE2B fb2ce5241798a3aa3f7c1c69608c5707f44bcb847d73d64efc690478a1958ceb01f36d749377dc13502cc6e160875f62bbae40f79e4299aefb5b2f8c5d5e9d3c SHA512 a6bdc6f366cbcf8cec17f3772c45d8ed081d926326870ab966653eba405d693f20677a1dfb4db44f077fc673b42d96689ee71ee4bd7f47a7a78ad5c93edcd22d
 EBUILD gnucash-3.4.ebuild 4282 BLAKE2B b105ee7ff529866108c47933850d0207198ac81ca5c84ab0ca4c55bef0992d52f6d34ad4a6a07c015df374cca7a06a1d6c72b2265f048319995e270d6b0dd8fc SHA512 3710292c480f22a77aca55ab5c33860a550cae133abf81bef4b006e23003eced962425c469c963e941c6e4876d90e49ca8a7e6f3c91ce1f8a016bcade4a12558
+EBUILD gnucash-3.5.ebuild 4212 BLAKE2B bd83a4d38c258f2046fab05797a9ccceb3e75428bb00ef42b28066645383aea052fe7800b091e05ec8c1da037c03af6655a43afb4955c4f35f50baf83fa1293f SHA512 48877cc1d507ce5fd85594c3cda1a806d8c5acfa4f6479b15b9a719c1cb743196b367fc0a1f4d0fb5e729a021c725578869c0f349c48001aa7421ac741ddfa8f
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/gnucash-3.5.ebuild b/app-office/gnucash/gnucash-3.5.ebuild
new file mode 100644
index 000000000000..9999712e8bfd
--- /dev/null
+++ b/app-office/gnucash/gnucash-3.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# google{test,mock} version
+GV="1.8.0"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
+	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
+	  postgres python quotes -register2 sqlite"
+
+REQUIRED_USE="
+	chipcard? ( aqbanking )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+# guile[deprecated] because of SCM_LIST*() use
+RDEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=sys-libs/zlib-1.1.4
+	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		>=x11-libs/gtk+-3.14.0:3
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		>=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	~dev-cpp/gtest-${GV}
+	>=sys-devel/gettext-0.19.6
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
+	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
+		|| die "Failed copying scm"
+}
+
+src_configure() {
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
+		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
+		# Disable fallback to guile-2.0
+		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
+
+	if use examples ; then
+		mv "${ED%/}"/usr/share/doc/gnucash \
+		   "${ED%/}"/usr/share/doc/${PF}/examples || die
+		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
+		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
+		   *win32-bin.txt || die
+		popd > /dev/null || die
+		docompress -x /usr/share/doc/${PF}/examples/
+	else
+		rm -r "${ED%/}"/usr/share/doc/gnucash || die
+	fi
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 53cbbea8ec33..73521286b9bd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,7 +5,6 @@ AUX libreoffice-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch 4093 B
 AUX libreoffice-6.1.5.2-gtk3_kde5-set-kfilewidgets-custom-widget-only-once.patch 1693 BLAKE2B fee5ce93d89458b90465ab6febadb9fd86c8c039d42af8a4beb15aa5167f4cab87737219b11037949c180f4f8e4672f5319e90e1afbf5836c5bc7977814b168c SHA512 ffb7d60d30e84bdccc590e5d6575727f63ffa237b68813ca34106b9dc8112c0033af6eadfde44887da69f35341a3dccd92281c8a40b55889c50cbdad87e0a207
 AUX libreoffice-6.2-ldap-optional.patch 6188 BLAKE2B 53ad75d5340f40b4229329e79b777464107553459ae56a2cce2e953ebc15b7f3decc4496fa11bed931d83feceb983d3a1613ea452671931244337125e8bd109d SHA512 9098e1208e1a35627f88ccd94f509ed48d28a02eafd45d9a20a4dcc2ea537a29b0f89c4cdec25be3e9af1773e93b7cf6d20dd0d8db9451117e4c61eb261f1548
 AUX libreoffice-6.2.2.2-boost-1.69.patch 1165 BLAKE2B 2d532bc33ab29f275243d63d0cf8a2bfabdd39898f4347eea255b660199a17a33ffa43a8493ad8559a7e1761ffc5d9b9b33bac98a35bb34fb037914ed8f7d09f SHA512 ee032c777ca3d038992562a31d3c42b8be478d9a2d26cc14432fb494a0a24730f96352013f9693397a6c5b91cd72aacf8030769f79ccdbc9f1d5a95945fb275f
-AUX libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch 3922 BLAKE2B 989555039328ffd97a8c5ec0edf108dda5742b2e0d5c5a8da8a7ffde91a6e1bd9be9a0acde59b32509cda9908c52ebc527769d1179a567fc97593b8f7b522c3e SHA512 98a97188800f9e5e7f7c8870ecaa35caab2d1ad110bf63f6f7824e7c398bb3c9e26151076b13753582b8cef2b30d27f934b3dfbf301a9605bd1053f4eb3f8461
 AUX libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch 3408 BLAKE2B 0eac3e69c3066e337ff67be71371cef81c2a6c51f4b5fcfeb457abdb23a76bc90643bcd05f801f4cdb6b2b5a58db58a7498c92d914c2856c78efbd4978161d13 SHA512 0715803bfe5764de59a7f12cb325e4def3a6d1927ea6e8077d2ade7fdcdcd107deeb0066b7a5185bba4129bf0b90e817516cd43b849e42731cdddc3382823e6e
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
@@ -15,14 +14,14 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
 DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
 DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
 DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
-DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0 SHA512 d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035
+DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
 DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
-DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d SHA512 1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857
+DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a SHA512 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037
 EBUILD libreoffice-6.1.5.2.ebuild 16965 BLAKE2B b4c7e322edfeed776794f313ed3e7382f35e8ba072ce058749b4bcd6627749f592862365fa8a499bd981ad2220bc60dcdd7dc574eff7612773b4351209a4838d SHA512 e59d2fcaa749c73f52faf339c78ff92b5ceae9f952509227b6f346cb4467b0737ea27349d64d9ab6dac5966ed356ccd2cd352156ea8a2b866fadf830d57bf996
 EBUILD libreoffice-6.2.2.2.ebuild 15946 BLAKE2B 5ee388f559cb2f2a51a3871603fd44faaea1fd1eb7198c17da208f93e6727daad54674be61257be9dac74e0babee0a4cb655f28bda7fc14e728f269cbaa511a4 SHA512 acb406eaceab2336f227847228f601b10ced5fb5b0a8793326d8d8f8a314727053ed8d26e838b203f1a045da804c612d99bfb87c706387914156791d9169e642
-EBUILD libreoffice-6.2.3.1.ebuild 15894 BLAKE2B 83ad85dfac22d739b782369cf0e876b2c8ab9dd6242443a625a248ecdea559bedc6b59869679cd51e9236b408763a66c4cd8e69dae7b43ee6b45b4ff48dd42e3 SHA512 1247524373fd25488c1752aa489b6693138097d67ec2bca3dd86c746c80a1d563386e0fbf8f139e82a044cf0c2762d7f5ca3626a87c0009d19f2861750f881b1
+EBUILD libreoffice-6.2.3.2.ebuild 15843 BLAKE2B feb83af7c3278346ef23a660061332994812e4812cc1b75581cfd8b951791a773b6f02dba1667ab89da6e489876224b8366a76fe875aa988d5cf4b4a3a659b0d SHA512 15cb1ffb9d3092e5004f9df2b35aa13c4bc3a484b07002a9129d0d83fb161914eea60c72ed690cd67eba6b6bb607882fde6595f9eccbd6420b94f07840e0b703
 EBUILD libreoffice-6.2.9999.ebuild 15740 BLAKE2B 4d1061d3fb675fcbcf424d68d7697cd6e793a595c723a8d8425ced8d436e4447165d85e19ab852ee82b63be82bc926fda8761fa8d4d13bfc99353999e92e4b55 SHA512 10ffedfe6da3f65e3ebd1daa5871400a88846e3b6393b454f802fd655837592713d91c936037cf62e686fcaf9ed49b6cf3ec58828a11d7e52db8d48b575ca10e
 EBUILD libreoffice-9999.ebuild 15678 BLAKE2B 6282d6df8cd81553e0db03edebd6150aac7df2a270dac3be8f22ce528524a43d4e6bb64e92ade05ecfddcd87252a815359a8c9283137d0129d416e85461787b9 SHA512 ebe8efc2dbe687012085584b91e0713f257827fb81d1610631cd34497c8d5473e527ded434b4594dda98b0b3af88b7d88ad4309d44bb95b9e805a8ebfcd7d568
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
deleted file mode 100644
index 17843e007e08..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001
-From: Aleksei Nikiforov <darktemplar@basealt.ru>
-Date: Wed, 6 Mar 2019 16:10:17 +0300
-Subject: tdf#123406 KDE5: Update delayed frame destruction
-
-Move deleteLater() call to the different event loop.
-This fixes issue with frames not being disposed of
-deterministically, and previously opened window
-not reactivating.
-
-Also hide modal dialog window before unsetting modal mode.
-Unsetting modal mode may require to toggle window visibility.
-Window will be hidden soon anyway,
-and additional generated events might make finding correct
-focused window harder.
-
-Change-Id: Id7839f817075785287b09f6ac79eb3fb211726aa
-Reviewed-on: https://gerrit.libreoffice.org/68852
-Tested-by: Jenkins
-Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-Reviewed-on: https://gerrit.libreoffice.org/70078
-Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
----
- vcl/inc/qt5/Qt5Instance.hxx  |  2 ++
- vcl/qt5/Qt5Instance.cxx      | 12 ++++++++++--
- vcl/source/window/dialog.cxx |  4 ++--
- 3 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
-index 91682bd..cece484 100644
---- a/vcl/inc/qt5/Qt5Instance.hxx
-+++ b/vcl/inc/qt5/Qt5Instance.hxx
-@@ -50,10 +50,12 @@ public:
- 
- private Q_SLOTS:
-     bool ImplYield(bool bWait, bool bHandleAllCurrentEvents);
-+    static void deleteObjectLater(QObject* pObject);
- 
- Q_SIGNALS:
-     bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents);
-     std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*);
-+    void deleteObjectLaterSignal(QObject* pObject);
- 
- public:
-     explicit Qt5Instance(bool bUseCairo = false);
-diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
-index 8de9fc7..58f93fe 100644
---- a/vcl/qt5/Qt5Instance.cxx
-+++ b/vcl/qt5/Qt5Instance.cxx
-@@ -67,6 +67,12 @@ Qt5Instance::Qt5Instance(bool bUseCairo)
-             Qt::BlockingQueuedConnection);
-     connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu,
-             Qt::BlockingQueuedConnection);
-+
-+    // this one needs to be queued non-blocking
-+    // in order to have this event arriving to correct event processing loop
-+    connect(this, &Qt5Instance::deleteObjectLaterSignal, this,
-+            [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); },
-+            Qt::QueuedConnection);
- }
- 
- Qt5Instance::~Qt5Instance()
-@@ -78,6 +84,8 @@ Qt5Instance::~Qt5Instance()
-         free(m_pFakeArgvFreeable[i]);
- }
- 
-+void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); }
-+
- SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
- {
-     return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
-@@ -94,7 +102,7 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
-     if (pFrame)
-     {
-         assert(dynamic_cast<Qt5Frame*>(pFrame));
--        static_cast<Qt5Frame*>(pFrame)->deleteLater();
-+        Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Frame*>(pFrame));
-     }
- }
- 
-@@ -109,7 +117,7 @@ void Qt5Instance::DestroyObject(SalObject* pObject)
-     if (pObject)
-     {
-         assert(dynamic_cast<Qt5Object*>(pObject));
--        static_cast<Qt5Object*>(pObject)->deleteLater();
-+        Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Object*>(pObject));
-     }
- }
- 
-diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
-index 0c75f85..1688163 100644
---- a/vcl/source/window/dialog.cxx
-+++ b/vcl/source/window/dialog.cxx
-@@ -1097,6 +1097,8 @@ void Dialog::EndDialog( long nResult )
- 
-     const bool bModal = GetType() != WindowType::MODELESSDIALOG;
- 
-+    Hide();
-+
-     if (bModal)
-     {
-         SetModalInputMode(false);
-@@ -1121,8 +1123,6 @@ void Dialog::EndDialog( long nResult )
-         }
-     }
- 
--    Hide();
--
-     if (bModal && GetParent())
-     {
-         NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this );
--- 
-cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-6.2.3.1.ebuild
rename to app-office/libreoffice/libreoffice-6.2.3.2.ebuild
index ff477aefb764..64169aefb4d1 100644
--- a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
@@ -249,8 +249,7 @@ PATCHES=(
 	# master branch
 	"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
 	# 6.2 stable branch
-	"${FILESDIR}/${P}-qt5-kf5-disable-qt-hidpi-scaling.patch"
-	"${FILESDIR}/${P}-kf5-update-delayed-frame-destruct.patch"
+	"${FILESDIR}/${PN}-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch"
 	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c6c50ea9d0d1..59cc279f0a6b 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 b0bbba3c1e05..f08c721f3912 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,3 @@
-DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
 DIST eix-0.33.7.tar.xz 626008 BLAKE2B 13d1f5b3096ec1ced13435f3680454c5b6f035ddbaa7877c7d2898b044fcc673f2c30b5ad25b8a3aa01354c726cf6ebf6483dc49f102145957dad95437931f63 SHA512 a6f2f553a05351c642c5ad5dcb8dc804585e1476d35dbe2c056ed493d1e37576e5e57fe0317f4fe4f6310c5439d23cbbe7384da8fbe9761eddca10e463950077
-EBUILD eix-0.33.5.ebuild 2643 BLAKE2B 2a9c179699e2df18328b1a1ff78927f8f0c5f8f476d3715b14fd10eaf1cd22c19895b4ebe46d5c05b618263b604ba73e903dac3838342ef5d23faf847bbd7071 SHA512 829d144019b1ee4beb72b66d51a42f007b9b09d122deed5f0990582de5012d0128ecc584010034ee1ab52b8f15edf939cdafbe3527b2ae7c651c4fa1e87f1c11
-EBUILD eix-0.33.7.ebuild 2650 BLAKE2B a911806af70ce176d43c7a2fce3b562da57b20195735819d5f068e10de2c867e179bdaeef45785e27eba68cf81e001159e6dabf02130d4b1144f0079f2dea41a SHA512 d9e3f091871b136d504e988826a20bc9f0fc5640ff3043953c2055378cdb3595d3248ccf978eb000358ddfed3276b4cdc359e79a498709dd1f05b9f2ae10135b
+EBUILD eix-0.33.7.ebuild 2644 BLAKE2B 1301d187411f980b58416fcdb0e69557e803fcd730046e11a420dc3fcd42a0b3ad5e95f009259125b0ac2c975eacbf113ab1c3c9e7e2c019abe2a678f16890f1 SHA512 8fe4859a67bcec7afa4b100cfda6e114c4038f112df91f97a3c8bdad6c7ca8b81b1b2b198d8391cbbc9fdc22fa94a374d2e57b9075afdea4608c98f13ab948cc
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild
deleted file mode 100644
index f39cd59bc55b..000000000000
--- a/app-portage/eix/eix-0.33.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="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 \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}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)
-
-		# 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
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	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.33.7.ebuild b/app-portage/eix/eix-0.33.7.ebuild
index 8015c4deaafe..4a2f1df7600e 100644
--- a/app-portage/eix/eix-0.33.7.ebuild
+++ b/app-portage/eix/eix-0.33.7.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 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index dee91d238cdb..0573d68d58a4 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,5 +1,3 @@
-DIST pram-2.tar.gz 4255 BLAKE2B 43d72f5602325490642ac8209a1b15f06ed5ffd160ce42c99ac0f46082459e2b6bbba5c4bc50b80f9e2cb1d263fc43b62f725ac924858e773b3b8af317a12bd5 SHA512 5e28fd63efc68f5b27b74712a49bb865fc32b1ad30515b8be74ae5a61f8fc9ba45c785b3a6ffef5e606e56d2db815b1038798fe44ed572ca6f5e5e6b42330476
 DIST pram-3.tar.gz 4334 BLAKE2B f06f9cfe938f83702baaa8f8bee06937e8790e533e14ab419251934d0f4300ee75d5377a4f4e0e47a774bd3c25ef31236d7e451b929cfbfe8343d226a311ca2d SHA512 526149523b748b57095ecb3eb23f6808ab57ee1d8dc60e27067931d269ce3465ad8a0e54e8edaa3a1f74fd0a8dd135fe4a92779382ba6e367112016bc254fc98
-EBUILD pram-2-r1.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
 EBUILD pram-3.ebuild 495 BLAKE2B 564ab559666243a00b0484e74608cec8d1cbe75fed20c86b7532ba1b2563af221e1dc9600ee4cda700093cd7291d62734e4ae8fa86b9c36c209eb14f15bce8fc SHA512 a5c13b3f07a9b4190c14f4c2ab23d28a060a6e48feaa1d0775aa950232489bb4343a35df91bcc1aa1e31d87f93c4f69d56977dcad7f86cbbbd35536c5177ed33
 MISC metadata.xml 497 BLAKE2B ed7f60c0693229da828921bfcf6e0a579a7ac07fda8bfa47124677d83e288a738a9c237a71070bacdaadce91708827ca7bc2ecf1755cec249945fe6fae752a9f SHA512 5588a6d5c641976a95b0696de4343cf3f96ef67515339e33f22a6f1255d05c6675a5f440a32354513f96fea7c57ae15230f02610f0650a400a2ef25815a5400c
diff --git a/app-portage/pram/pram-2-r1.ebuild b/app-portage/pram/pram-2-r1.ebuild
deleted file mode 100644
index d5151395d54a..000000000000
--- a/app-portage/pram/pram-2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to ease merging Pull Requests and git patches"
-HOMEPAGE="https://github.com/mgorny/pram"
-SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-vcs/git
-	net-misc/wget[ssl]
-	virtual/editor
-	!dev-perl/Gentoo-App-Pram"
-
-src_install() {
-	dobin pram
-	doman pram.1
-	einstalldocs
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 7fbd3dde14c9..909878b0d424 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index e77d81ce8736..b7a4e472f814 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -5,5 +5,5 @@ DIST autojump-22.5.1.tar.gz 54721 BLAKE2B ea3a852dddc13ece5ff177be0b3f384e5dcb19
 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140
 EBUILD autojump-22.2.4-r4.ebuild 2116 BLAKE2B e354d40e8f165ec2ddfc546ed7a82afe561cdd0ecfe0eff9c2dd8f6ff2f6c4faa5dfe8b884d97f4197399e3110b0635a19b8c1f141b3eda6083ed44b199df58c SHA512 c2a3239a7ba6ef8ec144ed271824e9b839b709ca2533d68d12499af0f3281cafb1b34ff58d8f85e9cee366f4674e46f5bfaf66be08b6038d121def8c06f0cb6a
 EBUILD autojump-22.5.1.ebuild 1923 BLAKE2B 0e8025ac920b11a9319fe56c0106c831940c8cce9cb88bf57049541e74e42a5aad037e10cca642b162d8543da2880c4bdf3011a5c89b9f20e25d18d900444e96 SHA512 3890a2fbf91e837aeb93c55b41da0536ef855b4edd27f37d28c8499e886eecc15caa5062f22cd39319367b888b3e2e7c9adbffc3058393e266bf1d09c8f95bb6
-EBUILD autojump-22.5.3.ebuild 1920 BLAKE2B ae331128f5a291060a6ddcf7908428983daf267df6e4ca5aba1f5a8384ebf13e3095e9f9902c63ecc1faee2e66feb4466c31bfe523af09a7a5dec10739174638 SHA512 58cb13f1cdf3c37033cf4f857beb9d443f2f32fa4ac5e736ad2650fc81faa16628cb360f5ee2e8a98c1d8f1b5fb6f56053bd1d4a699358d2875710f175195d4e
+EBUILD autojump-22.5.3.ebuild 1931 BLAKE2B 1a50811b2bd838993d829f55b7509e6ffcc49996f872e81cd11a11cfa5705831ab272a793652d1e7fac978a67357351d1e522b0d5f69bd0f886425c959cc61bf SHA512 5f9b37f76def6bdb5dccf02c6cf986681a90dd89795e2c79dd60dff7af3edb3dcf8db50143cf974a9f03d85fa44e49694b655fb70e8319b9d30c71c753ffdcae
 MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9
diff --git a/app-shells/autojump/autojump-22.5.3.ebuild b/app-shells/autojump/autojump-22.5.3.ebuild
index fe3883cf63eb..71bd16bed2f7 100644
--- a/app-shells/autojump/autojump-22.5.3.ebuild
+++ b/app-shells/autojump/autojump-22.5.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit bash-completion-r1 python-r1 vcs-snapshot
+inherit bash-completion-r1 python-r1 vcs-snapshot prefix
 
 DESCRIPTION="change directory command that learns"
 HOMEPAGE="https://github.com/wting/autojump"
@@ -24,13 +24,14 @@ DEPEND="${PYTHON_DEPS}"
 
 src_prepare() {
 	eapply_user
-	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
-		-e "s:/usr/local/share:/usr/share:" \
+	sed -e "s:/usr/local/share:/usr/share:" \
 		-i bin/autojump.sh || die
 
 	# autojump_argparse is only there for Python 2.6 compatibility
 	sed -e "s:autojump_argparse:argparse:" \
 		-i bin/autojump || die
+
+	hprefixify -q '"' -w '/usr\/share/' bin/autojump.sh
 }
 
 src_compile() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0dc4b0e4a86a..b96be30cb012 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index df745b67395d..0e12e498c850 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,7 +1,5 @@
-DIST libgepub-0.4.tar.xz 246016 BLAKE2B d51f55064d2dd0c9d6cb33884d9dae967b6a9ea971624fce333e9692abfaddf12c6ee4fb11cad97dc0fcc0b6a5d42ff71fc842eb205326ce8181af8e3ad46d2e SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15
 DIST libgepub-0.5.3.tar.xz 25576 BLAKE2B c51f6850c78185fec6f027ad5507b2402ab578b2ce6e4b91c674c3a3c6945857ce3d3ebd4560408ae8e5552ca658c40b30c73b42db1ef61f4814cde36a404df7 SHA512 8eb3370b6ca639135a1365756f3977f6daea3039bcb7ec4d5cd116d869584be2a2b1e8bb7f202d4c101f1afb0f7b9a45bd48c1b2337197ec4320d50a4c8d0183
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.4.ebuild 682 BLAKE2B 5e5e637ff47ed41cc130907d61d7e5bb4cfd4711d523350f12896926abf90c56f3f5994fdc17c329d5eeb30dea4bd5f7243059642c3261d3f5011f6581bfd1b4 SHA512 636d71bf49aa273232dc555c999febb2f10c14927f4a1c160c2caf64f5d6154921bf4390220483d5967c1abba4d02000e58c59f1270d18a5c6acdee39e9e9087
 EBUILD libgepub-0.5.3.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
 EBUILD libgepub-0.6.0.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.4.ebuild b/app-text/libgepub/libgepub-0.4.ebuild
deleted file mode 100644
index 101e914610a2..000000000000
--- a/app-text/libgepub/libgepub-0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GObject based library for handling and rendering epub documents"
-HOMEPAGE="https://git.gnome.org/browse/libgepub"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d6054c4507c7..07a3ad17b7bc 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index a27519e079ec..568dbf596012 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,6 +1,4 @@
-DIST libjson-rpc-cpp-1.1.1.tar.gz 179249 BLAKE2B bd8b737f76bceaa1be73d89a1f75472d8eae6f3da57a4da5a5a9eee2a52ba06034bcb4404e6b65368f6be1967c1a8b40f71e3bfbaa58f65b0ac8dced1b3f43af SHA512 64043aee3227262da41b56f6d53e4f8f9a56d3a43b695200020b47fb7eb6e121cf086b6e121c0eccecf381be90d77910d0f4371254d147f33310af4584a7d433
 DIST libjson-rpc-cpp-1.2.0.tar.gz 180074 BLAKE2B e44f4ada4430db178949d89c3db8db18b716347d88c4f41fe558a88053ca3e2e4085fee28a87d32f710f76d57e0de9510383bc04e17adec36b754e3db2466d94 SHA512 b03507c9e9dc370d0efe94c3a69b25cbc06b99907a6c145034a283d38d7dd2188a1af89d0ce05837fde28ff96b5bd7bb0903f5865f3eae01d275929a68ea5f99
-EBUILD libjson-rpc-cpp-1.1.1-r1.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
 EBUILD libjson-rpc-cpp-1.2.0.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
 EBUILD libjson-rpc-cpp-9999.ebuild 1578 BLAKE2B 94d3a0d77ee6c007928c0f90b503a7b0ac041c783fdcd87766ae2ba09c4d419906dd06ac0ecdd9b23a86e78295961e3f5f1ca8ba14ed1514ee4d61074885c095 SHA512 c0dab0ba3eff39b3c8af50c562d3bc3e7ee714cd8cc4daaed3df1f78ef4ac373987b3b8c57c363697d0fd11f04add0e4bd810297919ad7eb11c84caa8e19f0b0
 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
deleted file mode 100644
index 2ab94282c0a9..000000000000
--- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
-HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
-SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
-
-RDEPEND="
-	dev-libs/jsoncpp:=
-	http-client? ( net-misc/curl:= )
-	http-server? ( net-libs/libmicrohttpd:= )
-	redis-client? ( dev-libs/hiredis:= )
-	redis-server? ( dev-libs/hiredis:= )
-	stubgen? ( dev-libs/argtable:= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch:0 )"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHTTP_CLIENT=$(usex http-client)
-		-DHTTP_SERVER=$(usex http-server)
-		-DREDIS_CLIENT=$(usex redis-client)
-		-DREDIS_SERVER=$(usex redis-server)
-		# they have no deps
-		-DTCP_SOCKET_CLIENT=ON
-		-DTCP_SOCKET_SERVER=ON
-		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
-		-DUNIX_DOMAIN_SOCKET_SERVER=ON
-		# they are not installed
-		-DCOMPILE_EXAMPLES=OFF
-		-DCOMPILE_STUBGEN=$(usex stubgen)
-		-DCOMPILE_TESTS=$(usex test)
-		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && emake -C "${BUILD_DIR}" doc
-}
-
-src_test() {
-	# Tests fail randomly when run in parallel
-	local MAKEOPTS=-j1
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r "${BUILD_DIR}"/doc/html
-}
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 7b9d4e753962..a9b3bfceb050 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,3 +1,5 @@
 DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B 94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3 SHA512 e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
+DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
 EBUILD nlohmann_json-3.5.0.ebuild 642 BLAKE2B 6febe4e494834b7b050fcb4bfe2556b364dd2ef0d61bf2f83d837ec8a30bef517c80e67d1676e2b65957debf642fd2da5e8fdbeeaf16159149d8a96fef4fb165 SHA512 649bd0a762be3b89acfbcba0c49c683f5ac8a5ed4d07180033930ed7446d48a989781d2b2d5a2671bcaf7be02e5ff4e562d0186bd1c4d2b4c40a8b6a78993e99
+EBUILD nlohmann_json-3.6.1.ebuild 642 BLAKE2B 6febe4e494834b7b050fcb4bfe2556b364dd2ef0d61bf2f83d837ec8a30bef517c80e67d1676e2b65957debf642fd2da5e8fdbeeaf16159149d8a96fef4fb165 SHA512 649bd0a762be3b89acfbcba0c49c683f5ac8a5ed4d07180033930ed7446d48a989781d2b2d5a2671bcaf7be02e5ff4e562d0186bd1c4d2b4c40a8b6a78993e99
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
new file mode 100644
index 000000000000..fd4f1a4593e9
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_compile() {
+	meson_src_compile
+	use doc && emake -C doc
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	meson_src_install
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 035615ede445..f938b4c7fd09 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index d52e7501d9e6..0d56fe3e0da4 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -8,5 +8,5 @@ EBUILD lmdb-0.9.18.ebuild 1239 BLAKE2B cf75faf2a5fe6fd306eb7a28c2372a3bcb3a4395f
 EBUILD lmdb-0.9.19.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad
 EBUILD lmdb-0.9.21-r1.ebuild 1960 BLAKE2B b2686f3859333a1f60b4e1053e40e7214ed3196e35b88956ada044f6655c7ae3a472e999db56d08bfeeb3d6520853b1091dc6d8a321827e67903c87e8aebbe15 SHA512 288aec449c08655fe4572451f2960cd6c489158198fc787cb5ec3bd489578995f651bd5d13c36924ef35c2497dd157ae46a78dc9b5e18b31f913753a2a8157bf
 EBUILD lmdb-0.9.22.ebuild 2322 BLAKE2B 119d9c927f512ecb24aaeaba41641e3fa7bcfe99a9a2c31f27a6152d6a7d1976ec139677ea90a26e3e76f1aa011e16a554d7ca10391ca4d919de56649916f4a8 SHA512 c7f3540619dc06ef582539730f5060c1a2e784c410b91c7fc977749c3e78829e59cf424b6c9c15700168a22f48b22ae554700961374f42f339cd352c50d8c6d9
-EBUILD lmdb-0.9.23.ebuild 2281 BLAKE2B 653bd0c789e63df48dec191cfc80565f8755248ee9c131cfc82448b80fb952c794ba9b365f57c05992dfe45aafa4d205e8379c0f791e8dbe91384893228efe8e SHA512 b1c1cbe8a055f6c480347889bb1fe28e37b98229191c29890f68f873628be3e22be71207477d7bec5323fd60e7931e9b3255bde55a763557b0191e62b3cb2354
+EBUILD lmdb-0.9.23.ebuild 2280 BLAKE2B 09b6f148cea914965a44811f23e7e94c29ebc4d45bf123be6e6ef2936f59d03656025873c81b6eeff4c835349fc0e025783c953151da763711f60064f701d1bf SHA512 875562c9420defc4abf691735e4db48768ef022a9a547b02b0a6436e10dce543fbd90009c5b4c34c80f4553b4eb0d243f1907193ce61b470d0eb8c9d3cd0253e
 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
index 676ccb0568de..0c09a101ee6e 100644
--- a/dev-db/lmdb/lmdb-0.9.23.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 54aa065009a9..c92d5c363f43 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,7 +1,9 @@
 DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
 DIST pgadmin4-4.2.tar.gz 32382384 BLAKE2B c96806302e7c298e9fcdee3ada8fc519431eb3de778c55445de648e2867dc32168c5ad38209da63ac2d181612b2edfdd532f11ccd6020ab187c6fe23ef6272a6 SHA512 d3d242904c65f0af871890954c24005b4849b88599cde9a7cb82e077ff5db5a8c5f015c4af0b135d68f02daad42492af71373831c2212a36672af8d7621c3b2a
 DIST pgadmin4-4.3.tar.gz 22480328 BLAKE2B 4a7527b59d3b9f3cbfa63003c09ffe2c826dd965e906c46939324182ffa5c9c0e0258fd56be1480555ed4cbc1b42231727d632ccc7c3339982412654100db38e SHA512 db072bab1dcd0a18b9c423b95847c7873b9f458168ebaaf6473a9de5b44b3134e39f5b84aeba0a6ada42b1e867e359e44bda84bf55377cb0abc169c7455852b6
+DIST pgadmin4-4.5.tar.gz 22420769 BLAKE2B ae16e34c4cfce0ae78f06321ea1fc34aac0e081df4c0d5906fc4da0c82abb67e374477b8f9a9266d003579eb8887541e4224465ce6eccd86589129e1b3efff24 SHA512 835434612ac2a7ff89fab4c4bed89644e43506491ce12d2b74ffdbc25b33f2ac9ae566c95e886d4b4f8bca6499c40be5f0d776b18bfdcebd44d7ffe3b89deb5f
 EBUILD pgadmin4-3.0.ebuild 3481 BLAKE2B 697a5b6250d747aff9b4216603077a977a84c44bd344f935315eb0ca9a41b85527b32df819738d42626759fb8244392c15edd4909c9b8f03cdb82debf24f5172 SHA512 5f14d65bc3dac207fd3ced4105be3115cd0821a6a5054ce9d150d31d19ca5de44c66b3971444e200d79bfc6b11949cd437a0cbec388f26beef94ccdacb1c3b19
 EBUILD pgadmin4-4.2-r1.ebuild 3550 BLAKE2B 33cb384fe3f047cb6be2631a60094e50f103925fae6fc12d4258a4d5127129f664c3eb1ab86b04b739a2308af5fee9811be579ec9a7302459c4406934e39159c SHA512 f27da6b6bc91041bfbcb96e3066baf1467855de8a9862493b5916aecec83125a6e6bbf5d982aea678149b6f7f90b24cc0411690c8af3bd345d2c044168a44137
 EBUILD pgadmin4-4.3.ebuild 3549 BLAKE2B d82627ccae8b3f03a122ba277c00386ac18bf8ad8c429c00c2b62e6954c345c59c8adec627513d31618f5e7557ddd3b3b7a785553d163cf83f54da182ff5087a SHA512 d94f553d1877f9f5b0d411829a17ddef0fb3612c88c744e353738d831180cdc95a788c71defd38c7ea24e9225a7a18d75b161c14a428254de93ab0a95ca52416
+EBUILD pgadmin4-4.5.ebuild 3550 BLAKE2B 33cb384fe3f047cb6be2631a60094e50f103925fae6fc12d4258a4d5127129f664c3eb1ab86b04b739a2308af5fee9811be579ec9a7302459c4406934e39159c SHA512 f27da6b6bc91041bfbcb96e3066baf1467855de8a9862493b5916aecec83125a6e6bbf5d982aea678149b6f7f90b24cc0411690c8af3bd345d2c044168a44137
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.5.ebuild b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
new file mode 100644
index 000000000000..17dde22510ef
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 qmake-utils
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/click-6.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.2.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.12.4[${PYTHON_USEDEP}]
+	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
+	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
+	>=dev-python/sshtunnel-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${WORKDIR}"/${P} || die
+		emake docs
+	fi
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/*
+	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	local CONFIG_DIR="/etc/xdg/pgadmin"
+	dodir "${CONFIG_DIR}"
+	cat > "${D}${CONFIG_DIR}"/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
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 23d787e2a740..0ce1ab87a52b 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index efb4c059f25a..feb7e9b554a8 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
-DIST platformio-3.6.4.tar.gz 111885 BLAKE2B 5b4e85e412f1736d01f6d408ade86ca74ef215d53d2cbf2d5393023ff87a325426836bd0d5a602b8327d311e0af23f3a3128743712601df73c40b40e27d34232 SHA512 06f5c88950bd905bddd30e00e2f2154f2a4879c5ed5fbdb9cc56a039147daf4d33af5cb6b8c09bef2ed06b1c50d75e3d628cea0f6cb79c3af2498ad2e19cc33c
-EBUILD platformio-3.6.4.ebuild 980 BLAKE2B 0491f637610576b203e4551299ad35efc2bd948be9d5da803cee250e48d8999be3e7cba6bd2bd6186d03390b8b1a33bb601e9d11867d66e08a90bf85f0ca884c SHA512 06e108d38b33392f6e897760cfd83ba9769b56f0deca2441ff9f6df631a3519e4bf2142b178d58e65fc5baf879afb4d349699049215cab99b86a9d77e54b37b2
+DIST platformio-3.6.6.tar.gz 113642 BLAKE2B 00b2e3710f23bd459f3f95fc29515d65f36d78f51831c20864f9eb06e915495ce9ce719cca27249b8f69ef1e83db2a4462deb1b4676834940a018ae7af0a421d SHA512 41dc71e1d1e3ef5755f0902bbcffcd08704b7ec4ffd617142da5241e0a8fc9061bad7f373be5b221a064e91cad54a8ce0412303f814a2e66b72e80996765c621
+EBUILD platformio-3.6.6.ebuild 980 BLAKE2B 0491f637610576b203e4551299ad35efc2bd948be9d5da803cee250e48d8999be3e7cba6bd2bd6186d03390b8b1a33bb601e9d11867d66e08a90bf85f0ca884c SHA512 06e108d38b33392f6e897760cfd83ba9769b56f0deca2441ff9f6df631a3519e4bf2142b178d58e65fc5baf879afb4d349699049215cab99b86a9d77e54b37b2
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/platformio-3.6.4.ebuild b/dev-embedded/platformio/platformio-3.6.6.ebuild
similarity index 100%
rename from dev-embedded/platformio/platformio-3.6.4.ebuild
rename to dev-embedded/platformio/platformio-3.6.6.ebuild
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 9945c94f0574..cecc431271a2 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
index d719e4a3be1d..21b1b0e7314c 100644
--- a/dev-haskell/language-docker/Manifest
+++ b/dev-haskell/language-docker/Manifest
@@ -6,4 +6,4 @@ EBUILD language-docker-6.0.1.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64e
 EBUILD language-docker-6.0.3.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
 EBUILD language-docker-6.0.4.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
 EBUILD language-docker-7.0.0.ebuild 922 BLAKE2B d5cf310483eff86acd0aa4be62eb709736c49e0c80c1b2b382c6d906dc354e79afe731c428b057870cfcc72b639b42b17b0b9fb6d89df0c977cf2da00347e59f SHA512 fb2d057b6b2b9db73409b93969156a5e8262b07c10affb37081b1a4d667dfc8e34466086ebfbdf3758438ddaf7bd0bb7153f3df703414137eb15bcf53ce2638e
-MISC metadata.xml 589 BLAKE2B a6e7a2c01fe4fa9b0c1b0b18e612e7a1b39459bafea5ff32139ef28e09079c22845de6123df9d1977942fa7d0e791807b118f8f7be4b763372c289370f8cd668 SHA512 e9062624fda6b6ee56e3343948ad43d54e3c294c78e6421a1ffb1761f9254234a7189520247f0e3a4875ddc7492307902f27adcc5f0686911b6d4698bd41330a
+MISC metadata.xml 511 BLAKE2B 3ea9c78a66dd9b58cfc98817b59ba299e994adac70721cd1bb14c61b4859d5f73cb08e5bd451f2703be67cb2dd47243b538b801fa006339a7699d9806665717b SHA512 a654329d707ce888ab55e0d1b50bb3ad7f87dbff7f423fc72f7d5eb3bac3dd911fe88dd41ee0c0f7dbd1a92ec6f1a8f27aaebc4dc42830e1ab9eb1d70e2aa75d
diff --git a/dev-haskell/language-docker/metadata.xml b/dev-haskell/language-docker/metadata.xml
index aa5da45aea28..d046793375c2 100644
--- a/dev-haskell/language-docker/metadata.xml
+++ b/dev-haskell/language-docker/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		All functions for parsing, printing and writting Dockerfiles are exported through @Language.Docker@. For more fine-grained operations look for specific modules that implement a certain functionality.
 		See the https://github.com/hadolint/language-docker GitHub project for the source-code and examples.
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d975398ccf29..b32eb8a259b1 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 76834af2095b..46e51f73f771 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -11,11 +11,15 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.11.6.src.tar.gz 21113406 BLAKE2B e7372e9bf6190295176c66a328b3e31f9201776f16f1165136e24bdaf5c514d7895dd5880514fa054ee958ed5ff96814de9a555e47b3f6dddd388d1e57c0d05f SHA512 bc29df69a08a4e9e703de72b5eda5f2d63b78f18f3e7a1173eae5c6dd767f29f1b865a2fc3f692e15277df2d45e74ee17875b275eb3fc50aac2b88082e618bf5
 DIST go1.11.7.src.tar.gz 21113223 BLAKE2B e58a947a43e8dbabbe6d4dc1384239b01160e4d9cc88ed866c8d6e5a0ef66dd89203b9fb95c14c5fcc50ad47f75b17440cf1df34cb793a435d7744e630845307 SHA512 26bc2a3ab51ebe1179cd83897dae6ca17f30126189bf2c0b60060a25f3f22e72bcda383055825a9151948f074a103a177ab5550f5c2d088448bdf5455448061e
+DIST go1.11.8.src.tar.gz 21113433 BLAKE2B 272ef36664a180640f14afba18d2f715d5a335134b33cea449d14fd3b568c2322bbbac7aab254987fbd7dcf3d486dc8b1f62f14577ae2e57b21de1720d0f29a7 SHA512 00b57b0ebbbf53f4de718bf40e5dfdaf57cafa9932917d22e9723b5a33a62d335013ab49753d98f8fe30c71daca95c7addd921825fe0c3885942b342773050cc
 DIST go1.12.1.src.tar.gz 21963082 BLAKE2B fd9c0ca19e6bd285c52034a88df1a58f96b957483362fac2e0c0f2a9dddde0543e7569d76fb93eff473774d152db361bfe9bdd354d80412c71ee5c4162010346 SHA512 b3fdfb874e6e0e0b50458085724fbd8e8b9be212df3f777b97db340aa3b80f32ee08d646a57a8a7d52ff6f19657d884dd25018c866c6173473aafa20a58f1975
 DIST go1.12.2.src.tar.gz 21965624 BLAKE2B 9f4fbe62b37ccaf62517b2e5df3e1ada0155b7cb79067c2a74100df6d96ba89b0e372b5f1b1037b0cf98ea9f52623de00055793d011e5e39e92773a0cd87e41d SHA512 f7b8ffe8d3de7b456ba595deece5b092db8645e95d901826c33428af0151731921437222dcb5d52c9d937da4ebeb3192c30aa17052aa88c9e425e96cac2d79bb
+DIST go1.12.3.src.tar.gz 21965718 BLAKE2B 226b1028eb47cee8ccc0b72130a098a65211cf0e54030fe626b6b9cf1c16993e0a9677a443c07abd997e0f2bfbc1711c703a40869ae1ecbb8b8dfa0fbf31c0b2 SHA512 bd33e958f2e8550da14afc0576928d00d2b8ecac569ddcf3551e44a342ce78ad3934e36109cbe6c15d31c55448ccc092f6e1fbf82685d6702402ab67106a1424
 EBUILD go-1.11.6.ebuild 5963 BLAKE2B 11728beb9ff7ab042631ff558e14e3214b62a3eef6f4f7fd6671877904c8e58046ed9e6be6b91d486002e720a9e175ca7339aac599a41f05dd3d587ed69da179 SHA512 6f7dff5a3ed05a56ecb88121cc94d350b8e9cf8535727e83dac06183dfe8242b1a6bb946491e3ee01232aeb942bd65caac95d2920dd11ba09653a04df15c0a23
 EBUILD go-1.11.7.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
+EBUILD go-1.11.8.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
 EBUILD go-1.12.1.ebuild 5963 BLAKE2B 11728beb9ff7ab042631ff558e14e3214b62a3eef6f4f7fd6671877904c8e58046ed9e6be6b91d486002e720a9e175ca7339aac599a41f05dd3d587ed69da179 SHA512 6f7dff5a3ed05a56ecb88121cc94d350b8e9cf8535727e83dac06183dfe8242b1a6bb946491e3ee01232aeb942bd65caac95d2920dd11ba09653a04df15c0a23
 EBUILD go-1.12.2.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
+EBUILD go-1.12.3.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
 EBUILD go-9999.ebuild 5966 BLAKE2B 3c8cdf22159162824418120e5807e703918d19b4791fdf08b9b7800978b251aecd8da23517149ce88e73cbc23ffed1141afcd10de690eba9b24e52e4302c8505 SHA512 f13b7ae8102a1bf9a7dca556a3405ee1a9b314d36953718cf110f14e3060dadd8b9703096b56f42c98bae7dc18fabfc22f0e128deec8a43af02c4114026d440a
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.11.8.ebuild b/dev-lang/go/go-1.11.8.ebuild
new file mode 100644
index 000000000000..4cb21b53d193
--- /dev/null
+++ b/dev-lang/go/go-1.11.8.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_URI="
+	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+
+# If gccgo is not being used to build Go, there is no way to know the
+# architecture or operating system of the build machine, so we need to
+# download all of our bootstrap archives to allow this ebuild to work
+# under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/*.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/go/go-1.12.3.ebuild b/dev-lang/go/go-1.12.3.ebuild
new file mode 100644
index 000000000000..4cb21b53d193
--- /dev/null
+++ b/dev-lang/go/go-1.12.3.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_URI="
+	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+
+# If gccgo is not being used to build Go, there is no way to know the
+# architecture or operating system of the build machine, so we need to
+# download all of our bootstrap archives to allow this ebuild to work
+# under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/*.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index a6dc7f892587..e13aa48deb32 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -2,9 +2,7 @@ AUX clang.patch 441 BLAKE2B 6b60d1fd80301abdd707a8310e0c93d12e91bb9d680b72db13c4
 AUX linker.patch 667 BLAKE2B b84f58dd0c460e36c90c6ff3f6cc342034daede23bae157152c7c44ac845c0cd30c6773966227a0d0cb6b08bb70770323c04209c880b2150414687e973717207 SHA512 aadbd3676b5333ae3b8a04c75117633ca8b08c5fa0f695b9f7ff7d3019ff06211c986d0a0986c7dc329621cc1a57e23d50924fd49cf1367490d962fcef4b4efe
 DIST tcc-0.9.26.tar.bz2 525906 BLAKE2B 588e387d563ddede9842ac9012df36520fb1596bd3047fda2684ab44e49f8c1a35c1560c2fee724933cfcad5d618d84df853b72e1fee144b551cb67f7af1558a SHA512 abdbe208498cf4865a2036b5426616f5888b9b0e8d5d2fda6d1dd4afab3386167f12eca87d8a5c4c9b7dc88620d983ddce3e874b7dfa9c21eceea29ffa635d53
 DIST tcc-0.9.27.tar.bz2 634999 BLAKE2B 9a76dac9f54fa0b64a72e874cfec9a4bd9b938d244d064b2e76bd31acfb9e48fdbdb8895132634be1dee4302293405bf75606a6804c8178afa8fd30daa53b73a SHA512 835184292d97c07f0ff7b36ec550e855e649b04e23c7e2a1c706d223409eb60708dc1ae969f28eba45e56c8b96ae56936b93caf9d8a13ac5adf119014d5367a7
-EBUILD tcc-0.9.26-r1.ebuild 1568 BLAKE2B fab0abb6b2ec74a17ce36a28cbd42c61f5a70b293049fba563d4b753ec538936ef6d75b329a745cc27affaf177d6d825333f19949b0d71be327d6d7e2599344d SHA512 621f6d0dd29148f329245e8385d9d37fe742cc993f6d33ab1993cd4c8879c5d7b022210f8487051de4988e7a2dd4866e662dd572c6d5c8b4b67a4ad6bf2be740
-EBUILD tcc-0.9.26-r2.ebuild 1538 BLAKE2B e28c7c8b8e796d762f848676997bf10fbe11cc1fedb9a943bdb2f7a43d4a5a29d5dd617b3750dab56e3239653c42fb54f8937ea5257c0db30336f04dc49e67c0 SHA512 efc4358782dbfea9bddefe26328fd20e4d70ec2debb76bf9a7942d1d9eed3120749ff3cc1e6bde50dfa58d550b44efaa5a730082ba497f652304234a45500b31
 EBUILD tcc-0.9.26-r3.ebuild 1702 BLAKE2B 01eb3abfd82d3e76b799a14fe8593b64144975becb784182df81c0516f93fd8818fb0ea6f11bfb32e6c7fede220ad91d09d9f51d9702d0fb22e119fea18aaed4 SHA512 578de3aa7211dddfc4b5d08cf33d13d730140866a71b300e1753100cda606a9676efff847dea7f6420bad17e9e23844bd618557095aa33c6ee386583a136e569
 EBUILD tcc-0.9.27.ebuild 1545 BLAKE2B f162a055e57f04656b73ceb5edc43de3f69b893c7e3d94ce1749cf8604f1a366ec774769c0365b0160b1b7260ee245807e176481098998452216d72e226ad6ac SHA512 17da77bf834848d81396e715f23b81282f820a7fee07646b3a6b2c868a73a3852a3a53f521cd72d4f7ec5c930a1b9668bf16ae309f6fc10c96ba9ef9cf235bd3
 EBUILD tcc-9999.ebuild 1692 BLAKE2B fe9b98bb754a65cd7dabb4e5fbd528b1226df26c610b69ec3c84f1b3d14908af5eaf2fedff1c31cf08748778f9dd1b7edc3a4de2be1066aec192127f0b9d6f1e SHA512 90ba80835413a83a545d6545286626dd95f42f0ee3991609633f6ad1e29469a4a59edd0b23d57babed6a7ddc4f35781b9f324172a0d687fe26f5b7d155909b6c
-MISC metadata.xml 227 BLAKE2B 19026293506a0a59b538b2b180a5b103b7e9aaf1085678faaf40f4daddee9652ae0fd50d93e39911ae1a7904b286fdb5b429d2bc8db912d436750c10165acf8b SHA512 956cfcb6f6b13f50312b883afc2c1510909a27a3094b7c3b1a1a31b2e7947692036e7c216275be89196622ba7d16a99d619cc0b0cc682abe0f6e06339689db74
+MISC metadata.xml 296 BLAKE2B 462027e1d9376620315a4740919c364088046fd44ab966260c6c6b165e503da13363cf485cdbcfa97717746b76c10069d1a5bf775643277ef47ce68e99f1c885 SHA512 b098dffc9f50966e80349d0fca166363191bd5e4cca786c3cdefd613f46c59b4abc2208cf22a75bcc5459531905713ac6ada2cc2ad77231c0ecdc1fef1bcf8f1
diff --git a/dev-lang/tcc/metadata.xml b/dev-lang/tcc/metadata.xml
index 91830b9b654c..e9e27ec895b5 100644
--- a/dev-lang/tcc/metadata.xml
+++ b/dev-lang/tcc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-  Tiny C compiler
-  </longdescription>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<longdescription>
+	Tiny C compiler
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/tcc/tcc-0.9.26-r1.ebuild b/dev-lang/tcc/tcc-0.9.26-r1.ebuild
deleted file mode 100644
index 07171a4fca78..000000000000
--- a/dev-lang/tcc/tcc-0.9.26-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="https://bellard.org/tcc/"
-SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl" # doc generation
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-IUSE="test"
-
-src_prepare() {
-	# Don't strip
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile || die
-
-	# Fix examples
-	sed -i -e '1{
-		i#! /usr/bin/tcc -run
-		/^#!/d
-	}' examples/ex*.c || die
-	sed -i -e '1s/$/ -lX11/' examples/ex4.c || die
-
-	# fix texi2html invocation
-	sed -i -e 's/-number//' Makefile || die
-	sed -i -e 's/--sections//' Makefile || die
-}
-
-src_configure() {
-	use test && unset CFLAGS LDFLAGS # Tests run with CC=tcc etc, they will fail hard otherwise
-					# better fixes welcome, it feels wrong to hack the env like this
-	# not autotools, so call configure directly
-	./configure --cc="$(tc-getCC)" \
-		--bindir=/usr/bin \
-		--libdir=/usr/$(get_libdir) \
-		--tccdir=tcc \
-		--includedir=/usr/include \
-		--docdir=/usr/share/doc/${PF} \
-		--mandir=/usr/share/man
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc Changelog README TODO VERSION
-	#dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
-
-src_test() {
-	# this is using tcc bits that don't know as-needed etc.
-	TCCFLAGS="" emake test
-}
diff --git a/dev-lang/tcc/tcc-0.9.26-r2.ebuild b/dev-lang/tcc/tcc-0.9.26-r2.ebuild
deleted file mode 100644
index 757cc7d58e06..000000000000
--- a/dev-lang/tcc/tcc-0.9.26-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="https://bellard.org/tcc/"
-SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-DEPEND="dev-lang/perl" # doc generation
-# Both tendra and tinycc install /usr/bin/tcc
-RDEPEND="!dev-lang/tendra"
-IUSE="test"
-
-src_prepare() {
-	# Don't strip
-	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile || die
-
-	# Fix examples
-	sed -i -e '1{
-		i#! /usr/bin/tcc -run
-		/^#!/d
-	}' examples/ex*.c || die
-	sed -i -e '1s/$/ -lX11/' examples/ex4.c || die
-
-	# fix texi2html invocation
-	sed -i -e 's/-number//' Makefile || die
-	sed -i -e 's/--sections//' Makefile || die
-}
-
-src_configure() {
-	use test && unset CFLAGS LDFLAGS # Tests run with CC=tcc etc, they will fail hard otherwise
-					# better fixes welcome, it feels wrong to hack the env like this
-	# not autotools, so call configure directly
-	./configure --cc="$(tc-getCC)" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc Changelog README TODO VERSION
-	#dohtml tcc-doc.html
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/ex*.c
-}
-
-src_test() {
-	# this is using tcc bits that don't know as-needed etc.
-	TCCFLAGS="" emake test
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 922fce0bf4d4..056d4aeaa205 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 4fd86039694b..697ee10dd561 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,7 +6,7 @@ DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b
 DIST elfutils-0.175.tar.bz2 8786600 BLAKE2B d6d4ade37741da788c6c2eec9688c6f8ac9707e0b17e0518398972dab3cf77a70cc82346c2e37b41f0ea414b9a1e925a7567567fcf43d504d75c92971ab25f5d SHA512 2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
-EBUILD elfutils-0.173-r1.ebuild 1919 BLAKE2B c537761db3cac2528fe0c2e2362eb7ebea231f03a13fcab61a13a7f77f617b41709bf2446c33c169e9db62acc46109d5bca393dc4a320c96c546f66eee6c5547 SHA512 300649768c6f1447d13fb4232e8cc0119c8193927f724b06704b8af2ed25c91e053995ea09e4da00a2d9a4daa7df3cda1ed99eea80cd497d17ca15d7b3a252f3
+EBUILD elfutils-0.173-r1.ebuild 1917 BLAKE2B 4e4780bdddb5558f93ddf58cb80b1c7a79430d51ce0d9782f75bbe4c9b63fc863950fcea1ba2a4090c24cc6c08d08cd930ddc8f6637010e0487fe02dd5c25938 SHA512 fdbdfdf9bffaa80a5ff70c99fd6117726c7f52cc67235309da40b82fc1fdae1baa5c09e238e16acb58e07ebb56af11bf2548d731f046fe5430fc7ae3106d4d52
 EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
 EBUILD elfutils-0.175-r1.ebuild 1954 BLAKE2B b4e6aec7008d866b1f0060908cfcf9b1d6b239162d16108e08a7e7e16f4d735c0db19a5ecac2e697e0f3360dad9e441b2266ac3baac8f6849669ebbd3f8db53e SHA512 d3b4faefebb70143d4f5ba2559910206ef0ae6abe232f57b94affc65d57beb157ca7e682710410ecf4941911bd92a94995f6d454496922797cc03570a4af7a6c
 EBUILD elfutils-0.176.ebuild 1908 BLAKE2B 1472eb100a0844c972eb09a7ddc6d19d0875c2c8e3dae44ed8bc033ce5f7e868c3b990b38b40b92840675e3a215d4e1a28f153847c5f02f633f9b6cbd4a4882a SHA512 44187ea7978b94cf0a540ae4bc1df337357bc2a6a29f13c5ab2933d70ebce256b3c28e1819214a86deb47b59be0b2f1c08c9bc503c964aaa36354b8066801818
diff --git a/dev-libs/elfutils/elfutils-0.173-r1.ebuild b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
index 878ea33c9224..93437df5a6a4 100644
--- a/dev-libs/elfutils/elfutils-0.173-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index c698e77585fa..a1a0761c9626 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,4 @@
 AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
 EBUILD folks-0.11.4-r1.ebuild 2478 BLAKE2B 1374b653afb4d043e01eeba556839b32914bd7cd3fba274b431f0ff53d3843a9e7c097cc12df6a12f824122de95a1a151f3e50decb92dc34c490af50428089ed SHA512 cdc7da518c16b6be0110802d3974b9128c86b33acf8aafac1dae7b4680eaa17271948d28867e950084bdbca1eb54f76e41f6830f9906e7e8a0e1d6c99116295c
-EBUILD folks-0.11.4.ebuild 2315 BLAKE2B 62bf6fdc24e0b1702084e9a9b559f281a93b4b36e619b877b6f2d42149e1e83514a72339ba1a0f2b8ba858fdd95c0df1a55e89068a60e6a4665be47cbea59de1 SHA512 d8038166bd0970f3fe22df78479906c3d332da58d695e1b1238bf6f964cc939e3f03c6a40e09483f40aa4a7fbbd80e91614e70318f4b37a5e8de486f55184be1
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4.ebuild b/dev-libs/folks/folks-0.11.4.ebuild
deleted file mode 100644
index ce7878547564..000000000000
--- a/dev-libs/folks/folks-0.11.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.40"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-# TODO: --enable-profiling
-# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth debug eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	>=dev-libs/glib-2.40:2
-	dev-libs/dbus-glib
-	>=dev-libs/gobject-introspection-1.30:=
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-
-	bluetooth? ( >=net-wireless/bluez-5 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-	tracker? ( >=app-misc/tracker-1:0/100 )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
-	net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			>=gnome-extra/evolution-data-server-3.9.1
-			>=dev-libs/glib-2.40:2 ) )
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Rebuilding docs needs valadoc, which has no release
-	gnome2_src_configure \
-		$(use_enable bluetooth bluez-backend) \
-		$(use_enable debug) \
-		$(use_enable eds eds-backend) \
-		$(use_enable eds ofono-backend) \
-		$(use_enable telepathy telepathy-backend) \
-		$(use_enable tracker tracker-backend) \
-		$(use_enable utils inspect-tool) \
-		$(use_enable test modular-tests) \
-		--enable-vala \
-		--enable-import-tool \
-		--disable-docs \
-		--disable-fatal-warnings \
-		--disable-libsocialweb-backend
-}
-
-src_test() {
-	dbus-launch virtx emake check
-}
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index cbc2c67ff449..589d81d53f27 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -8,5 +8,6 @@ EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d53291
 EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1762 BLAKE2B c43f64a13e6aec5229d0d774478e4c29719b6a9055aa314a56d11b7b3b00161674b85ceef8693f713f11436ce19c730ce502a4e2c5274d2c5d015790f7c3dc6a SHA512 a243098fd587b73e37cd71794618dd56a4351fb2391a63b5f2a7c817f4636c091abce590d6fdef8bb575bb275e06142202d22c93b3ca837a9972d27a6659640e
 EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
 EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 1996 BLAKE2B cdcc9c4af325236f037f8746b30accb3ac3ba9b243db868d43aa80657a09bf23b3d6fbe83fe355b77fd572dda0d638df8781b4c1354cb12ba225940d1159ed84 SHA512 2da677ab4afc41ec79202dccb1482758da48d34e496b4b82010d0b3248e52794667841cba837ee639ed8debff363c30b67861ad9a9ff67744072bf99d5765daa
+EBUILD libcdio-paranoia-0.94_p2-r1.ebuild 2009 BLAKE2B cff2adbdac88fcf8cee94c35cb1c3f9cefea244a5d51f210ab6c3b19932f7096745a810b83be6a06f5bbe8265f316d36c97e28feb67138c93e1c0ec41b6af482 SHA512 89fb173584c80a3a5aff705e7909f271419b429c3c2f825b87a3b74000b52bc2a12df4444d2fce3a77ff137ed6cc54df0b609e7a4246d1b7c9eb8194b848fdf0
 EBUILD libcdio-paranoia-0.94_p2.ebuild 1983 BLAKE2B f52c30321180172fdba8646e329f565ca58153dd6a58efe66e1a4e33c7bf18a6ffc60754cc4da39d6295577162d513a4b33e893743378cf6aa2056b6ae0452f0 SHA512 902bc4b48df3f4948708871b6272a1ee6494aabb43ef2264ebec0e841ee52a4ff70ad1ee69ba1650cc31a5eb553d8e3baec6bda922b0377bd50e9ff5cd80b4f6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
new file mode 100644
index 000000000000..85b83bfa513c
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0/2" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		# upstream accidentally default-disabled it
+		# reenable it to preserve ABI compat with previous versions
+		# https://bugs.gentoo.org/616054
+		# https://savannah.gnu.org/bugs/index.php?50978
+		--enable-ld-version-script
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 83b1dc75d5f5..980fe87791ea 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,9 +1,7 @@
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
-DIST libgit2-glib-0.27.7.tar.xz 137784 BLAKE2B c27511045e81c2bc1dbf0793ae9630358bb13c3fcbb317ccad861e5796772c120895ab6e3dafe7fedc78406d0cd4bd31aee6cb022921ef28bcd45b72f22bdd04 SHA512 33bf9401dd96cc700d0365e51dfa5c81be3930f1ad01d16d878a27efd7e03bb089a23b6db6af500bc20903e6178300ac79fa4e8edfca29e8222aaa2cd3dab63b
 DIST libgit2-glib-0.27.8.tar.xz 137796 BLAKE2B 4dc6d9b435a662acb3fb51bd7349b9c273bad68073ca05d1c27fa59148a39549036e5e8786ef502e1c5758596bf58a80c7153837c6a5956c764d69d71b860531 SHA512 abeb530971edcdc3e813d34ebffbb5d2edfdea527372976e6495f9370a4a7f63c7f34e61bdec02a602a8b5e687960e33f77dc6cbc8f3b65accee7c195b03b593
 EBUILD libgit2-glib-0.26.2.ebuild 1304 BLAKE2B 9a3bedeca6910a8bb1dc73783869b733c8135375748ee3be8ae1695636b7cb0e92f12fbadd701ce08ea438a10d898be30a5d10bbc25ebb3db31d82b32c6d6ecf SHA512 b111e69cd3c5ba40f24b12060c9b3cd5d61a3b425c173e14743c82dcf425b27da9786d52b79cb3c0af94302a29cba058ec70196b752cacad2262bfecdd72ebd3
 EBUILD libgit2-glib-0.26.4.ebuild 1329 BLAKE2B 1c9c368df50d5c65f0605b503255582c14e0ab0f487acaaf7e198d720d8a7510ef1f15449aeb9afb314f2ce3b7fcd57a2f8cdeab0e768a73e977636699ead4cc SHA512 0f58111ed32d83a14ff6f1a6f8eaa8cab306a527a15c26678e92965dc25e56587b3e33d973c1af15c7089b99c23451d06980947a835a129abc3c78988de06526
-EBUILD libgit2-glib-0.27.7.ebuild 1269 BLAKE2B 51c11102e0126e0e993a9255e0ccabeb86fab0d3c19486c30812c349ed8f1126e0c907ced4cd2107c748b65496438d76b3e5c94c7e02d33531345ede5ecbb32d SHA512 6e25faf80bff9f4d1fc5ee60912edf811716b44383454ea075381e92ff70e147055b41af7b94fe2b51339819b16e105aa50bd86314c85be6065d92aa39e3692a
 EBUILD libgit2-glib-0.27.8-r1.ebuild 1266 BLAKE2B 4df6e06fa3b904017f9f7e9059a3cc8ca3b0401677baf2413b8d46f654ad119d43134cdb9adaafa026fc536ae6b4afbdf1f607d11a57e507076755d20bd5cb59 SHA512 622f882d471f63b1375100db72b87dbe4cee5a1642b2397b7e1ad225dfa9550cc5c984547ddc08ed5e84d8a858a8451099483de80bee37c9b77f5032387332ec
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.27.7.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.27.7.ebuild
deleted file mode 100644
index ab9ce3117461..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.27.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libgit2-glib is now compatible with SONAME 26 and 27 of libgit2.
-RDEPEND="
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/glib-2.44.0:2
-	<dev-libs/libgit2-0.28:0=[ssh?]
-	>=dev-libs/libgit2-0.26.0:0
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		# apparently broken; fails to build
-		-Dgtk_doc=false
-		# we install python scripts manually
-		-Dpython=false
-		-Dssh=$(usex ssh true false)
-		-Dvapi=$(usex vala true false)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 610a3477ae78..1f332709f1ca 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -5,5 +5,5 @@ DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d0327
 EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
 EBUILD libgit2-0.27.8.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
 EBUILD libgit2-0.28.1.ebuild 1689 BLAKE2B 65f1c812181d41fc28b38607bf30d4ae45eb6be38ec7e66ffae2d63479d572c9f4138c10ac83e8821ecb2cefe90f1ff1ea6ab943b5647b60e63ab24297de6022 SHA512 9a7b6cefffbb9cd6a594585519a1732408cc60bceb135c64d4a4d50af2eec147100c3d85fdd737fa5ce39162cb861247bf6f6dbf1c390c9ae1fd510ea7115528
-EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+EBUILD libgit2-9999.ebuild 1666 BLAKE2B 13764cf2ab93446ce7e85abf5bb95e8dab5173dbfdaf8df68a9bd9d1124f5505f1123f1a77f2b87a460ad7669a46d6a8342b1f1a92e182ff63fe914ef9faca08 SHA512 f34474832878ee22827f5853c78b8089b9f8094104ca0dd77e3a70bca05b87e4edcf6a0b9b90c417b0da4d338cd8716db086c08d74c35a5c8236c3fed1888c49
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index d10065358a4f..bfad5c3fdc15 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,18 +18,15 @@ DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0/27"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-libs/zlib
 	net-libs/http-parser:=
-	curl? (
-		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
-		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
-	)
 	gssapi? ( virtual/krb5 )
 	ssh? ( net-libs/libssh2 )
 "
@@ -38,15 +35,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
@@ -55,7 +43,6 @@ src_configure() {
 		-DUSE_GSSAPI=$(usex gssapi)
 		-DUSE_SSH=$(usex ssh)
 		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
 	)
 	cmake-utils_src_configure
 }
@@ -67,12 +54,13 @@ src_test() {
 		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
 	else
 		local TEST_VERBOSE=1
-		cmake-utils_src_test
+		cmake-utils_src_test -R offline
 	fi
 }
 
 src_install() {
 	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
 
 	if use examples ; then
 		find examples -name '.gitignore' -delete || die
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 7d361e05c7c2..341241bf0923 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,7 +1,3 @@
-DIST libmirage-3.2.0.tar.bz2 234214 BLAKE2B f2b8c42eed89efaeddb8051160c51814b4df45c1ca7cdb4cef683b86ea73dcd1446c6806588a9df0410da5b3971ce8945f2479022f21177237ee8b0d4b18d2d3 SHA512 15507154441b660f5a58e1101d4e6f9931a7640b90d3de5e387274c72be07f367b54a6be34dd31442bc504459414f611ffc39f86ff6a7381a820d059aef1d6d6
-DIST libmirage-3.2.1.tar.bz2 233650 BLAKE2B 2ac7bc30108c0bfbf27524819a5cb3d24fde1abc70f720bec50d37196386cfb46f7f9876c45437aadd79d6f9f3318afe50449a97ad36a7bcedd0872ef434a687 SHA512 fa22c26562eea600a1056e730bfb4690918b09f61be91319229a87975b0468803fa026e8f06bdeb9551ef5242179a3dec023e0fcd7f0773608ff77c32741dea6
 DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
-EBUILD libmirage-3.2.0.ebuild 1169 BLAKE2B c6da6b1dc32f7458a95d145693f292997aaf19dc503ddf3e000a0f966ba0246a5d5f21dff788c57eb73324edf998e91b09d51b13670f814e5840c65169f2c5e2 SHA512 c51e74c976adf1a63627c9c057ca183f259eacc7c891dde8d489227d30d0cfad397952664311e7e3a61cb837750173922672f78f4ceac4095e9bd929b710cbd9
-EBUILD libmirage-3.2.1.ebuild 1130 BLAKE2B 5881183a18ac94a72a1e1b726fd9a7ba52228429b5a5cc8453eaa0612baf62887dfbd0547f07dc635f0a713553ae370f2ffbb501e3e3e60fee69c5ea385a1289 SHA512 9ffd0463afbd1004a165a7bbfd3f20189dfc398cd0f2609b98bf07736730bd97832af592a322e11dd496bb7d7ebc90570730dce5ba7a97f51602f22ec4a2bd8b
 EBUILD libmirage-3.2.2.ebuild 1128 BLAKE2B fbf5a809841d07edef43316e9363c6405d1262c422431f3623b882df6f0972cf1ba43bffaddb608ae865ff8d26728603b08169199e61b40d1d5b2bdb81950977 SHA512 a793624c4915c326d3fc99dee5ce2a103f8f82bd3322ee83ff438413fc0b1b1d7619d40c74b5cc7cedd9a708ad69f405ca5ca1ede848a14bc118a656905702fc
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.0.ebuild b/dev-libs/libmirage/libmirage-3.2.0.ebuild
deleted file mode 100644
index 6a8dee5778fe..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.28:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmirage/libmirage-3.2.1.ebuild b/dev-libs/libmirage/libmirage-3.2.1.ebuild
deleted file mode 100644
index 59575853b6c2..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.38:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 9d32dc7d6b71..d62fdfdce66a 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
-EBUILD libowfat-0.32-r1.ebuild 1052 BLAKE2B 7cb4aeaa6ac53a4aef91964d519a64d3196588806b8675f16cfa9835cac7aeb4043e5f40a769873686ce6ac7f832060f6a9202c80e9b6e8d31c324c022a33c02 SHA512 40a3cb4cf15343121e9e040a33bcc26b9d66a9bcddb7c83b29098e97aa26327dc736aa6c1d786b69b84c0e4e19be7ba37546e16024a676d5d1b567844e857d20
+EBUILD libowfat-0.32-r1.ebuild 1059 BLAKE2B 943515922768e29ee842c1c4d7af1ec36d537e376a9e586929c54f980a0e5d06d39d4cba253294ddc46fa68479fc6636d49eb2928733904a08f0bddedeaa0fb1 SHA512 a4921c521398e8c6241b59b3a401be19f43b3cb478801cd9fe410df62c2356957d685a4322bbfb53478ad1e217cc7736a0d624dd479581bdfefe49f5ceb89070
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 116551cefe17..22437a7a7a79 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 9d7c1e9211a4..5b2671c61ad0 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -2,6 +2,6 @@ DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.6.tar.xz 3354840 BLAKE2B 0cc5c91967cbadda8c12143d4de6ebffa60c7031bc314338e7ca1e036866b460bf78e28b7f7737bee8243198ffa655c99b3e743d639c5d2b5ed93f210fc692bc SHA512 664fa303d6b2b037254bc6e19d79b7894444f5c38fb7b1fcb73f37512dc97bc01c8ddbb23563093e271c562a9fb49c96fcc9019889a57a95a4e8e162c8619f2f
 EBUILD vala-common-0.36.15.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.40.14.ebuild 2520 BLAKE2B d690094377b1c062d918ceee34544263ad5edcc801cd74ee3ae15d2aeebcaef302c15e1e49e8d5e1c2e64e4f73d5e5f79b24685c1b2bb1a557e55dd5e1cfe824 SHA512 d80d5b26dd8a0bc76450198a03b9d343b72a96fe44271b8cdb07b33f958fadddd5919b46b98f2cc865c65a4b21dab79f46767e3280c9daa63cdd7eeebce149ec
+EBUILD vala-common-0.40.14.ebuild 2519 BLAKE2B e27a8ed0c771864913f04185d9db896f0f5f93f4d40ca3b01d361bbda5bfcc77644dfb795dda6a0960eb80039e9ce5fea94c9668141c6c5dbf37878704ec6e76 SHA512 15d1970c02784c3478587d50db4e003c13af835173405d954fccbb56d4d12b6b0d4073c8d0e49d3055119afb8ce6915e73fb03d7a1353ec6336d215bc725bfde
 EBUILD vala-common-0.42.6.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.40.14.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
index d6306bbb09fc..add7d40d2a28 100644
--- a/dev-libs/vala-common/vala-common-0.40.14.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 1d13fa3a6147..e8be8dafe23a 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -7,7 +7,7 @@ DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
 EBUILD xapian-bindings-1.2.25.ebuild 5543 BLAKE2B bc376e81fe32e1f746c5b917133ed66bb825e1a55bf3423cff3271e5aa7f3459a0afc3fef865486655412245e5c6156ffc98d5875b77e596a3b4bddb57be79ba SHA512 be4114e06d5f88f34bfc84ba6ba47723196f2c1160bf5e3d519875f1616fa0382873cf16f42bd423d625a5f80c5b888329c33089fe4bac740bff73d324192501
 EBUILD xapian-bindings-1.4.10.ebuild 6534 BLAKE2B e1468aee423fc1c0284ad421bf430b62d2457bebae9a5b8c159dc44b1779e06ff7afc0cfeea5518c29dfd690b5fa14ca7c4e1311342712c84d40307fd764e441 SHA512 8a50548190bb01223290c35de4dc9f5ae3273c8373f2d9dfc1a788bece537380792dd53d3734a20b43c2bc700618400c1d9ffb36346c0f1c7b721ac8e29fcbc0
-EBUILD xapian-bindings-1.4.11.ebuild 6534 BLAKE2B e1468aee423fc1c0284ad421bf430b62d2457bebae9a5b8c159dc44b1779e06ff7afc0cfeea5518c29dfd690b5fa14ca7c4e1311342712c84d40307fd764e441 SHA512 8a50548190bb01223290c35de4dc9f5ae3273c8373f2d9dfc1a788bece537380792dd53d3734a20b43c2bc700618400c1d9ffb36346c0f1c7b721ac8e29fcbc0
+EBUILD xapian-bindings-1.4.11.ebuild 6534 BLAKE2B f217fcf369d5f5ecc89d877a5d74731e8b7d6f769d43b936b984184136ed4ad9ba99615986972b30f43dd2ed0f1b03e1617edc80fb1bed1807d1a39e7f907fbb SHA512 c855cf19e281edf72532f887544758f641a45c44826df2488cf5f57d6669ef5c7f8e70c21fea27ecc6d45eaaf14421c5918e7795679e1728e96a0cf6792cbdae
 EBUILD xapian-bindings-1.4.5.ebuild 6492 BLAKE2B 7f64c5cba86f1ca2870b8df4a23bef48dea2ccb33a74478fd244005e75d28d868788fa9e1407988d29f504fa6073785ceea849bccf608432204d01f5ca242629 SHA512 bf33d6e312125fa75b42562d062f19e180302ac112d2347e6e5c77ba151b6375fe7e35e370952077264062cd998f604f811aa5414d445f80a9b514d6388621fa
 EBUILD xapian-bindings-1.4.7.ebuild 6494 BLAKE2B 2c78c2b3bcedabadb4cbf0993ee613fe0ec39d526b50b7b3b53bf2a73d31a70a0af29917954ba61f2acee56e3d2335a42df5d43c936d0067e3fea007a81647ce SHA512 3c02f969c0d02b697eddc4aa80cc3bbd5fd5bcf69eac44e10fbb1225bcb1edd477b8e476c9d1bcb2b0f8458696c6f060abe58f610ef550a2880eb22c0c2f358d
 EBUILD xapian-bindings-1.4.8.ebuild 6499 BLAKE2B bb41c2156fc1248676bb623264a4abe5a88d0acf721f27dd24ecfcb032c2be8615bf5a7e39c54889d038cd42dc3fa313cf36967b8100d9aec711fd61ee21e0ac SHA512 2a4e37fbe178bc8308eca40503cf751bc1dd67ff8c894bb4b4558ad266e9e28475157974952b5bd5e1fc8c84ca06c880d1876d7bf8f058e46c122b249ac25aeb
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
index 2420ca3c9f51..193d9dc89083 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
@@ -12,7 +12,7 @@ PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_OPTIONAL="yes"
 
 inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index adbb64fc8a46..4f490cf5f619 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 31ae5fd6b0c5..22f042e2d601 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -3,8 +3,10 @@ DIST attrs-16.3.0.tar.gz 57512 BLAKE2B e00c825034b21cb4d5a9eb9ca3ffb92193b8d793e
 DIST attrs-17.4.0.tar.gz 97071 BLAKE2B f755abe89cedbf1ced003087fb106fae7c38dbdf0614ec0c525629ae09b3b790a7e0912da887dad4c5686afe7fb0df8123fea42e08e4e6718cdaf477edafcb2a SHA512 b631cd5af1be7c78175230363a3cf9d37cb0237d87b24f994812b5734985d114708d5bf7ee5d92b8b13c6b8daa313efde4a9f60f0630df0b62bbcf4928a016ff
 DIST attrs-18.1.0.tar.gz 106346 BLAKE2B ae17d5e6cde83e5a652b40facffe3db2ad9d6940ef7e00a10c3d02b6015c23e9e17e125ec16100f1fd5e036c9f4e88cfe01b23b03bacdc36446ec0ef1dcc57a5 SHA512 9aa4421d1c16614cd26089c219f70602fd6baa5fbbf4aa96def189e9a41f8c761d7f522c5e167a63e366cf8b46e87477c345655f09738a14981bb40dbcd12b91
 DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
+DIST attrs-19.1.0.tar.gz 124220 BLAKE2B a7a8321857c2723398db3b7943f221cc141f2d365b84d3f77ccd16c9180fb1d73402c7a1018d70b666bf76b6021bd90df14d792886c1345752b8fc810ac54a35 SHA512 22ee45e8b10a7abe10e720788c5cfab424d0bfe70e595dfb116928b8ebea497a747e8234d96549da00f0967de750fb943db0cd3669354253a27be2ca30fe413a
 EBUILD attrs-16.3.0-r1.ebuild 870 BLAKE2B e7b23da8eb4bf32594bd5bc17924231a4c42a40efc80963522a32361b2315aba095d6058d27351d772a91de029ad61ceff9a3418c4969919abe43264f8053cb9 SHA512 7c346b07cc557a999fc224cab21f3807bc10bb1e8b051eaec7905f4fb95f5c87e71a3081bd2893d8e371c08f43541226810590d5b43f801d1bc69f8f764951fe
 EBUILD attrs-17.4.0.ebuild 885 BLAKE2B d2e70f4ca7c9b7e1f96d671c757ff14b56132f139458996ee473f3271844c2c0c257443ae26d48d600d666de4a35a763d0d92acf67cb0df3c57acd01cd23570a SHA512 28f39a5c0e0caab4603757f7169e0159cd8aae2182b0a8c5b417125a14e28a31e6873076e1e4bd09588f818304faf549a14199e93910da8c3c88967944d77f15
 EBUILD attrs-18.1.0.ebuild 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
 EBUILD attrs-18.2.0.ebuild 933 BLAKE2B ecc0f3f9ab27767f600e730936fdc86c6615c4b7f6153f5af56aee172f077a7c2d02923031a3ec830582f119e7f8e53785b3158b9b6213dd61be80a6ade7f64f SHA512 7510410a518fea7e83e26d02b276f5d439fbf20937b1ec0321f2bb50d180d7278642817f5def6a8871b213c108bcb4e4a910bdd0a2f4669c346635e9b99b2fd4
+EBUILD attrs-19.1.0.ebuild 941 BLAKE2B d5a887a2261eebdd5f60f86128403efbf5b850d9534fe5f6d58aa43dbae97340480a9f8dd9c46dd8d3a81e6abad74d9e52286e96f199b1dc8a1fa3f08a072427 SHA512 2fbe62752f32dfd8d2bbc29d5f330ade076a4a67fee9b9ced0e0d95e6d7cbb1c57f670ecc4feed0879c519f65e2cc68cd9b6e086a42292527134134afb6f0a02
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-19.1.0.ebuild b/dev-python/attrs/attrs-19.1.0.ebuild
new file mode 100644
index 000000000000..dfb02c9af557
--- /dev/null
+++ b/dev-python/attrs/attrs-19.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	https://pypi.org/project/attrs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/collective-checkdocs/Manifest b/dev-python/collective-checkdocs/Manifest
index e7907c8ad7dc..15a3870da999 100644
--- a/dev-python/collective-checkdocs/Manifest
+++ b/dev-python/collective-checkdocs/Manifest
@@ -1,3 +1,3 @@
 DIST collective.checkdocs-0.2.zip 10865 BLAKE2B bb6013564f5763d75639c2e17d01dfc8a3ccf2a47e59bad388738c4e31a37ec7f7e247ea2847f304771b0ad80d0dfd78cdf048d2dd4deda0a6a5f5ad307522a8 SHA512 c234a365d3e89cebd467a42f98be256e8e24e42c88e5aee71556d165deb8d7d54d4b515fa6fdf70bd24e7727e083f3b6fb061aa304fa7a72de7e8612ad2fc2a2
-EBUILD collective-checkdocs-0.2.ebuild 751 BLAKE2B 11f51f5f02f9ed0a8919b052b661967a7db87b9649127922749844d2f9cd4c420e07cca188091350b591d89f800429a3ec69c0016297b2794e9cd00a921f4d93 SHA512 17de4aa030ab8e0d104502fd0182f5146e9591521bbecced6cddc832d709b6b6db6c5b880ca94d2f7a6185983ac15290dbb18c015719d882f778bb1a946e1fea
+EBUILD collective-checkdocs-0.2.ebuild 758 BLAKE2B 9f5b7c22cc685d3268ce3785d3e7a025eba160feeb1b0b38099fe4bc32395c106cb88f8cd1d1af4838854f884f65066d063ae83f17af069dd61e3c0a8bd6a877 SHA512 3483ad4648e1fe4266cadd2a814d12cbed38ee4e1af92d09e9aecbbfd77307a365129ab0660e7579dd07849ac0503efa46979d2f711acd86423d620033195698
 MISC metadata.xml 606 BLAKE2B 2858dbe47b07baf0d8c69ac4a3df9774e97489f6b8ae9fa7a880095cbe3ca0a62c213617ee6ed4ec47d1b20792fa78f05ac217ad673a928b8efc472851e8fb5a SHA512 197107242cfa084e5b1e7cdb3b2b16bf493891156b8e478dffaa40215e2a7a2edb4115101df22889901abb71a23faca6d02ca7720af76a968a60b52eefd26913
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
index c169808f1bb4..b88c59f81305 100644
--- a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 05a0356f1005..332831a7030c 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,7 +1,9 @@
 DIST decorator-4.1.2.tar.gz 32325 BLAKE2B 19754506bf18f03748d61fe3cf85e13e91f5a7b4b3550cf087b1c9506fa2d10a4fb6c32914f7c2078a74ac34f5ffaf0edf8b15aa1f46d2eafa91926c40430dba SHA512 4a4b9dc39de9b3f00eae9b6829136f5d836355d3d719371440f69c33fdddf73636e9faaa8fc35829c64d5c5a61d968ea427267da944c524c22ad08b69fb6f0ff
 DIST decorator-4.2.1.tar.gz 33376 BLAKE2B 29a03fb4af1de8c60c5ba4a4b30f59f8b1aa8bbde107b9d5719cc0a084c45b58f7e14ff2046d7247c43d57717db57aea0db52dc068d73a73188a0e022c058cbb SHA512 8a6fc53f830470fe15d4bf9dfe8cea434019aa2e1734e55f873dc617138a6ba75d63ddf50a3fcd21a8f67d9d1b19c35c75149d8cee157e909aff4873093c4e0e
 DIST decorator-4.3.0.tar.gz 33758 BLAKE2B c967440ba18205233e5b032f22553cdc33dbec8a3c285407317d47910ce7dbc884c9802d1591f36a08b3f2adc5532145c92965946af81ad167735a5d0a65f047 SHA512 63894b12af62ad357638b99290c34c2207ba33813b6cd8ed554236ef45a091f337b6eeee829b2af82f2e71699902e49aff49acfa22d5449a7833ba382cda2751
+DIST decorator-4.3.2.tar.gz 34892 BLAKE2B 49485ec0ae25947b27dbc23c8f17194bf5b03778e7e43524e561c320487e1b6830a1ab39e9fba2a154e1cd00155af779965e497724f01d81d301a0ca979ba058 SHA512 87102e1b314086d008c48bf53f1061b28fdbd3ccd3d301773102fd43e3a4ce8b5ffeb9107fb5d5f47b7bd45c26e5b3b2913ea20745ffc9b274e2c0b24a69ef70
 EBUILD decorator-4.1.2.ebuild 787 BLAKE2B 5807d744db9b5224594ff90de71f806abdda9866d67954336b61555a65a19667c363459f2f9a752f849300e46219989289e26c426138f9bce4244207dd0b381d SHA512 b8329497682fd22aa251712e650b512531f79ddcd66284adc9340255f3f8dd04686e6514c354425965bc298d10d184500dd3cd3073a7175bcc2985e4fd648131
 EBUILD decorator-4.2.1.ebuild 787 BLAKE2B 5807d744db9b5224594ff90de71f806abdda9866d67954336b61555a65a19667c363459f2f9a752f849300e46219989289e26c426138f9bce4244207dd0b381d SHA512 b8329497682fd22aa251712e650b512531f79ddcd66284adc9340255f3f8dd04686e6514c354425965bc298d10d184500dd3cd3073a7175bcc2985e4fd648131
 EBUILD decorator-4.3.0.ebuild 736 BLAKE2B 41065d61e60d93ae2dd35bb0de9e1cf245e0e64b0eb1e894876eba2964eb9bfaa676015cafbf3f1f3b66a2463d06ff69c15b18732b05736dd017808c4b77170b SHA512 96a1b43a1fb30c75e48df43edb56030dc938b93c720e8259f0c768d9105be6f9528df97ef12ccef24c1c218c79cdc3eecc0864a11fb908da87bb8061f3583654
+EBUILD decorator-4.3.2.ebuild 727 BLAKE2B 07697a49bc60b63f3bd0e1de02564637ceb022653e30800e5bcff147edcaae0a7faffb70e48397b4ff26461c9f5a8086bfd6ca7e1e590b46901b389da9cc3f93 SHA512 6910c5398f5709e36ec1462eb0dbb989ff5fa2a31dc4bf9a191b7216dc72c13c938db3c0044919604effdf208c6cab04c316e1973e1dc1aaaaa7a38129d6d9e9
 MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.3.2.ebuild b/dev-python/decorator/decorator-4.3.2.ebuild
new file mode 100644
index 000000000000..6384cf96bba9
--- /dev/null
+++ b/dev-python/decorator/decorator-4.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst )
+
+python_test() {
+	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
new file mode 100644
index 000000000000..ebce7708c10b
--- /dev/null
+++ b/dev-python/django-rq/Manifest
@@ -0,0 +1,3 @@
+DIST django-rq-1.3.1.tar.gz 37462 BLAKE2B 17c3eb4527315c7d562586b5d62ac1866d4e1de755a61f6d882007139494921efc689b3c649f0647ceb2b29d6b0914159c5247af33cc6c21ac6108beef7c40dd SHA512 7e8443889fb7f7e8059f81fc8e7cd319e5a8b54c0388130190a39cc167bcd2e85b761f7f3703a3cd37e5be245cbc788d98a121d048837dc77072c8713c332577
+EBUILD django-rq-1.3.1.ebuild 536 BLAKE2B a2a8ccdab041255c32a5f4d80cc9995c66b4ccaba6e9190c30dec396d3b2ca676f88979da668ffa8b446f80203ba9be56ef1e4e4178411182d6ea3158da093ad SHA512 00db47fa7a946eb892ac85979f2660077687227b7a679fc33ea6845e8b759d5b936adabf3c47af729d815f2db07359762399a0243f1590df423626cd620d9188
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-rq/django-rq-1.3.1.ebuild b/dev-python/django-rq/django-rq-1.3.1.ebuild
new file mode 100644
index 000000000000..55715b0a45a4
--- /dev/null
+++ b/dev-python/django-rq/django-rq-1.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
+HOMEPAGE="https://github.com/rq/django-rq"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rq-0.13[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/metadata.xml b/dev-python/django-rq/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/django-rq/metadata.xml
@@ -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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index c7fb917b4b3f..419cedd4c0a6 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -4,10 +4,12 @@ DIST docker-py-3.4.1.tar.gz 207885 BLAKE2B 472f5dde4761b02a2b55c64762a0529dbaecc
 DIST docker-py-3.5.0.tar.gz 209142 BLAKE2B 56e4400e1f67c870274eb2fdaf84edeac966a1486366355f2697f0fc4e5f37c5e4f3f8163e9187219a4fa27cd43be2bc19370a99755fa880c9e089d6af9bcc9e SHA512 c5ebc99df66d49f53c39ff897bd95afcbb92ced3ec6fd61148b6775cddf9e830454b1da5ac79ea0bba76f143f35f29dec66e7db5c6df33ca5157d3fe40cd4e93
 DIST docker-py-3.5.1.tar.gz 209381 BLAKE2B de0992aff9af240eeb79b66f0f7ca11aca4132cbef0ca9796cfa778b0f44e2ebf83858d0e4df2b9dd813caa83e1c301829152362a6983e5ee96dd5806815ee6f SHA512 8e927794cd308e17fc75f3c6569026c9b9c9f44eb2aa1c191dcfc6d1aabc36bdd341795ba9a2243ae2a27c428868c9f45e8bfabd7c1c798f3f4c85b7855eda6d
 DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4162ba1be81bc69c513d1de700326a4e8ffcb1c015e20516aa1a09d31162d54182985eea3dc1dc23d6e79ef28fea SHA512 b32acb2585995c3c5bdef95ea4bbb6bcadba3b9fca81a3e637dc294b5dbd3823ee6c98236c4bb197373a96feafcaae665b9c64b805abd52e1ae27aa42079278d
+DIST docker-py-3.7.0.tar.gz 220407 BLAKE2B 3ba217957ff8746fb399ba23e4513810ffd96a758bfc5eba908ab3c66eb0a9711d94e5d9f517c301602961a21490659628d0a3deec3a4286155a4f5469304a3b SHA512 444634a26d0ce7af4850f346286cdac7f2c597aa6ce349c6371dbaa670aa0bcc2fa192221783b2059750d682580e34fcc5e115aeda0884838bf966decf9d0070
 EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
 EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
 EBUILD docker-py-3.4.1.ebuild 1401 BLAKE2B 403e424e83ee8234197ba80e26e0efea57c22bbfa8df00e1af89cbee96fa4fb131edd3a45c89192a47c141a52e317a79923c303f8d320362194636f86317fa6e SHA512 cf34bfd3985f0eb4e4c139a2327a306ecc5a2a581206c0f51a62f0c853259b7bb5caba6850c2effd40d9b3ed52682c2f65b6079c86558b9ed4ce1da7ad0f0963
 EBUILD docker-py-3.5.0.ebuild 1401 BLAKE2B 403e424e83ee8234197ba80e26e0efea57c22bbfa8df00e1af89cbee96fa4fb131edd3a45c89192a47c141a52e317a79923c303f8d320362194636f86317fa6e SHA512 cf34bfd3985f0eb4e4c139a2327a306ecc5a2a581206c0f51a62f0c853259b7bb5caba6850c2effd40d9b3ed52682c2f65b6079c86558b9ed4ce1da7ad0f0963
 EBUILD docker-py-3.5.1.ebuild 1398 BLAKE2B 15f94c2229d04c34e23a6087fcee5f8ab777d46e32590ee6b11a8f1e22d81ccabd9ece88c09b491e4c2f3ef63202da3ff9a7f81a895ba424dbbe95f1b2f7f7bd SHA512 577558768c06210caa882ebdc4a26220d01bd33c3b916423c9af6f7d9201fe38a7ad50c1b9317c6aa016a0b31be153a5c36b564b820e18ba905b12af9642133b
 EBUILD docker-py-3.6.0.ebuild 1436 BLAKE2B 138eefbfaae0c7a2a56578c1d8e23c7b2b385ea696b8003d82116c17c9993c7d510061beecdaa87efe9299aaaa73597404134715e6ac39ae507815c828c51d84 SHA512 b5824aef1a019e7dcbf8355469c401ce8c8e070b6482543817bbaca427e40ab727bfadb31fee07601500d9446ecef75c311e6912dafeb0f912ccc7e8e9ab1bbc
+EBUILD docker-py-3.7.0.ebuild 1438 BLAKE2B 2136903d06ef82378aaeb67b7edff8056e67013de28f626f237334777345986d872f4268cf62fa38ed6f6ab82641f149791aaf3160a1ff93553c1582e5e5294a SHA512 432ec5963ca6d047a406603c7257fbac36014a1cb7599004a4e0c8fb032009188d11b61f205b594b41f4eef70b65f57215ac7f8b718efee6d035f98a1517a63a
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.7.0.ebuild b/dev-python/docker-py/docker-py-3.7.0.ebuild
new file mode 100644
index 000000000000..23df023bffa4
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.4.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 87ff7e0ee9c4..fbeed5805167 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,5 +3,5 @@ DIST google-api-python-client-1.6.2.tar.gz 4262337 BLAKE2B 0ae3e5b1c6bbb80999cfa
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
 EBUILD google-api-python-client-1.5.3.ebuild 1132 BLAKE2B 57e30f9ca7eda67b6f280e9dcb014968bbe539d69b9f8bec97a807976fe172d13bf3f8cd2ff3e686712c1fd02f75b83584c7c0004a662035f1614cdb598a9f42 SHA512 3a4fb461c807189da1d26e3388fff90ece1a30ca9b8bfeb51841d7f68a36c7e8494ec7589d0760ac15e6744a5e5d4ddd691875ad5aeeedb9cdf54d37d2f29ee2
 EBUILD google-api-python-client-1.6.2.ebuild 1194 BLAKE2B ea6981dd0cb48f90f0c07237c5ebf8a3927cc2d3ad7f37ca07faede40e8a0b92ea63bd9ed092937495e19e3a64a4583bc13dfa7527e7320c433f0db7ed66e199 SHA512 41384e153fb18d48229bb57b7413267342e8ea8cdd5a560fb6fbef8aefb540dec712b410edb4b02b718d022b3349c87028d0d452d7b18b718d0590c7dd829665
-EBUILD google-api-python-client-1.6.5.ebuild 1194 BLAKE2B 0c9f20067803da8dbeb6f1f759ba8118282a4ece4c973ad55e7b2910f367c9cd893e1eb3fe68330374b1aaaf56f378bd44bddeda8a0ba3cd3a55717565b68d78 SHA512 cfe6616a9f1b4fda92b5a11bc793383c93f680b13150152325eee414ee75ea233292ce45e41dfb7f39c18d85eace00b5ef6641e9a4ddaf95b663021616a4efc7
+EBUILD google-api-python-client-1.6.5.ebuild 1193 BLAKE2B bd47c67407458c3bf04003edbb75e4f462767f90a00423ac5fc34069350325774b885c20b7542ae6f4e1a1ee9d9b227d2d774e45fe93317e872bc7c0e3675fad SHA512 db432c38fc13e2fa8d35e13fa2b39138e6d93679eea16cd287989db2d90790d9c38e6c22f831efce4a726273e04a6299e01bed0222f89fc44969a0603a3fb59c
 MISC metadata.xml 356 BLAKE2B 57ec373091acbeaf75beafc097b6b84f56bc052d9c27b0386e12579e3bef8ca955413d38344ecdac04c7f5a0ab463295a827efd5c6691db1cb958fc4a7f350f6 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
index 0141e3fbcc9d..aef9658ce8fc 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index c71db15b251a..98c81de8a237 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,3 +1,3 @@
 DIST google-auth-httplib2-0.0.2.tar.gz 10830 BLAKE2B 7f2092d83c318510b9140791681a58bd3e436f3b5966c8dc53aa5b041e50fdc4f93c276810a0e6ca20b14a919eb37588ae1d027b5eba74f79f44a6809909dd4f SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0
-EBUILD google-auth-httplib2-0.0.2.ebuild 1159 BLAKE2B fe99c2dff6b4316a1f61f6b1baf1835b5fc8a1169936373fc7c577367630e41510a43ff5c7850f3a45e308f9fcf54169fee798f0abf213a5d7879d49bac3109e SHA512 3acea745d359d9bafb67eee53195a28a0f3f3ec3fec3a4859e3caba7543f8d16812e65c55ca9010a9f2765f55c4c6fb0f306b1c466bbcd94bda82d62f9880b28
+EBUILD google-auth-httplib2-0.0.2.ebuild 1158 BLAKE2B e86e88d0b2db8567df9ae049cd7b74b9f2fb6198a6608fc99ebb2563084c9f54b2d12f8abe8ec8a4c58de618f26ee898656c1cc321c06bf6ceed22cf3cb0f660 SHA512 9a9762c9f13c8fe66d45a166e41fbdc5890d50e73899151fb72c5cb5cce7e5eeada936a399648f8d051fb39a42f3fae7f446bf2dc1ce4ff882a32ba1a2b3643a
 MISC metadata.xml 422 BLAKE2B 4aa4a1542a90ed8ebc399dff1824e77e9f695104e4e59317af95e21719d993ceea8c5ed512d15cc2d9d4085bdd1afcc70a58e2f0d7ce673508e2cb6f52d3664b SHA512 bba9deccadfaf0b663a2f6239633f20ee02838d98cfa25e4d8c399e5635c4cd0b811dbf821f18edf98b328a56a37146bc316aceed6b5b057ef5fd2cd151bbaa2
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
index 0dc982d38631..0346532d38cc 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index ca8ae2324610..1da7701567d8 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,7 @@
 DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12aac0eec8e08d06f0b17aba9c4f5ed44f19ca41c737a249611ce02b98e03474d1e995909c5755222605e004d11fb1d SHA512 c10822c6b75700503a06a4b3a43a123d57605a043eb494bcb0232cc3941fc039d0803ed75be26d0da72fd4df613135c290fb3fdf82b0fa47d4fe0729462d80f4
 DIST google-auth-1.1.0.tar.gz 290602 BLAKE2B efc1ae38b29693f035ea9d19af83bd0e098dacb143192d77140ea1548a17dd051b344b6b34044f6d02e5bea631fe4026dda4ba7c1053535641f34aed08cdd48e SHA512 03b4021f5bc3c60671e1e528642af4682828e3a83a07aa9dea8a28b3f97c4020ac47f325c8a952f366d45196e6a9a78a78e1abcfc8d7f878f7b6369434a0b79f
 DIST google-auth-1.4.1.tar.gz 74272 BLAKE2B 8b9c8f59979688bc8a28d3f6c32eb06aa527b3cf9a515ceca51aa346d70622786292f5be5a4bdb2ca266b777d5d5fd41061af3afd4a2608a6673192ad643ed8f SHA512 cba174049a331c8c0ea5b82da0096641d975f59f1f2c3237c32b1730b4c9f9d12f3bfdcb6cc9b9f9c87109d509dcd423d0a4a4d98200e707052760c253f3ee45
-EBUILD google-auth-1.0.1.ebuild 1352 BLAKE2B 4bc86f85500285bea12e07f09cb6c64a66d53a0bd5d6964f8eda995255eb4fa6a2e283bfb0337e9d914d771345e56c9d9997e73b8661ce3d5de1dc4ae86beafd SHA512 2f9984d4b3757109c34f32b3fc65f0ec013a4dd4c8a0e4cc969373f79c89c817c8ac4846ed1595b6fe96cb9317eaf9f4e5a869bc0845d1d57c2c7b0c83ae44a0
+EBUILD google-auth-1.0.1.ebuild 1351 BLAKE2B 2dfec5ceb21a5c22a80ecdebadc9e56071088475d6cc15c3a4c370ef354498ac498f50686830bb85dcbc2732177406041bc2caac4aa7277cacdd5723a4190160 SHA512 46bc7b2e22ecd0b7486ccda5657fc39ee76f70a9533be70e5694e7e052914819789b81af9ba96d08832ba5dd91cf649052c48328e89cc60a3facbb25dbd42586
 EBUILD google-auth-1.1.0.ebuild 1408 BLAKE2B 875a6041b147966846677fb20aabac8e6b770c029957ea6541718e65f00356acee84843d2bdcaf24870a607786281a817e112a92ebfcee5145160b3e24d6f739 SHA512 5ecb50909393bd8eed6232785b0addd3d016dded8f056e479e79438d49c9a93069c1c8706266c0fb6d5b587320af81b6cde4bfdec923d2c25efce60d8b212363
-EBUILD google-auth-1.4.1.ebuild 1227 BLAKE2B 5a471bac1110592fa6f155774bc8024886721cf819fb82f8e6367dc740b932b521cd8af2a3109bfc21aced7d5bc6d22720c113b231fa20ac6a52122dbd1a81a5 SHA512 15ee5dedf521d870ca9664fd040e671c7fb4c426d90f606980399d3dfb1d93d5921defa7b7a2b2b9bc5d941561433387f78dea4b7b4ebd2c44643dce88819914
+EBUILD google-auth-1.4.1.ebuild 1226 BLAKE2B 4556e81e985ee81b68a8270bfd582bbda003da41dd843a5e4ed827c768f68e09aa204371e75d02866095b012459de13760f458c08b4846a6626df26313a439de SHA512 9d5d277201394521d3bc4cdccc45a5f05e7211dd814401b0a4e87384cd79d28e228195124f22221d910a251c017d4c3c734512d1486eb9297b8da0895499f43f
 MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
index 2564d6ef7f2a..776b797abb68 100644
--- a/dev-python/google-auth/google-auth-1.0.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.4.1.ebuild b/dev-python/google-auth/google-auth-1.4.1.ebuild
index 6ae35798ebd8..59c5587cf0fb 100644
--- a/dev-python/google-auth/google-auth-1.4.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 5de1299d0490..ba9d9a0ae907 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,9 +1,10 @@
 AUX httplib2-0.11.3-use-system-cacerts.patch 2252 BLAKE2B 37cc1122f0f7859f4f26af03d45ed67202ecdecbb19b3a513dca8c723c490c17392c719bcac0937c2c52ba30238ac193b477b2bf8bb4dc84cff0ac1a364c9759 SHA512 a8a34d77dba477ae30bfcdf38544c09006e409ab9a7cd8419d4f3a061199eb53b96df13175e32e87085ee75cd7c1d403c1aa6f3929ddce301b4927bfc9eac543
+AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d7efe2ae587808c7d9ce23ad0f8b507f51751054cd7079bfca55f9b3496b4806180f28da9acf0dd812ff16f14d9bb03749e7 SHA512 08022280948e530890664f8af9fa5d3776b14526bbe2c55151b3631473b100b96c3c353ffd8df5a4d03d553ce24f962dec53307f7e23c257404920247940ff8f
 DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
 DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
 DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25
 EBUILD httplib2-0.10.3-r1.ebuild 940 BLAKE2B 0298eb3562438abd69645aa560e61d1c7c8afe32ec7cee359c1808e25fb2bf9bf4627eb4f292171a8068dfd47871b1cd05879c7f6e41b68b351f08e08f028e33 SHA512 1f3821451c34e16d71da69d857e0c3ac49a1f792843beb56db7ca85bdf7af7609626d511258b65d5bedbf4f1d6ba14ead2f413e35b124f06dc3994fb3cca117f
 EBUILD httplib2-0.11.3.ebuild 963 BLAKE2B 023a09283c555df784315c75af3da17e0899bd9286c9d8bf532f280fa18fa3d8a9d74eb7e3c82791212026d9c85c8360681f055e54d4ebb15205496d1c4618ca SHA512 61eb164353a8ed14de4ea20dea40200963504b2bfd28fa7630e13dcdf1ee9d42d18ac7c990c8c8458c6d3c75058608a4b5e52d57905894f902da49bc69333572
-EBUILD httplib2-0.12.1.ebuild 962 BLAKE2B 45a4132f9cae749a2cbce12c96282e8e68232e0735a47100d0f5fb3c66c17a2232d65b0efaa83d7ee72c135ac874cc620cebd7f0033d5b057121ce8a15e3564b SHA512 2135d1b826f5a2681e73142c72856707d3c8e7ba529c9df528b5f501a59d38c105569bf91a4ab380600ebe1124936c35ec668cd81207eb737bedc8d3f168b6e8
+EBUILD httplib2-0.12.1.ebuild 962 BLAKE2B e58339cc8f0a5765efe6bb8976c1585dc38c14fbb14f17245b4d7abcf6165e8b9e76e613bd8e3dda6c994cadb4b669724afbc3be0ec8ed009a174a166afdb8c5 SHA512 30488f248b01fd74251a92016f78700f1673415e9bdbd37f0fdf6eede1effaa29ee2809a05172453db99616f365ae0f2d1b0c23bcb7d688eeef97da8ce1c7131
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch
new file mode 100644
index 000000000000..e189a5407243
--- /dev/null
+++ b/dev-python/httplib2/files/httplib2-0.12.1-use-system-cacerts.patch
@@ -0,0 +1,26 @@
+--- a/python2/httplib2/certs.py
++++ b/python2/httplib2/certs.py
+@@ -19,9 +19,7 @@ except ImportError:
+     pass
+ 
+ 
+-BUILTIN_CA_CERTS = os.path.join(
+-    os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
+-)
++BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def where():
+--- a/python3/httplib2/certs.py
++++ b/python3/httplib2/certs.py
+@@ -19,9 +19,7 @@ except ImportError:
+     pass
+ 
+ 
+-BUILTIN_CA_CERTS = os.path.join(
+-    os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
+-)
++BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def where():
diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.12.1.ebuild
index 0d4ac24b5236..e80ad4f83e4c 100644
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.12.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="app-misc/ca-certificates"
 # tests connect to random remote sites
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.11.3-use-system-cacerts.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
 python_prepare_all() {
 	chmod o+r */*egg*/* || die
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index feef038908d1..74d99cd71eb9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,9 +4,11 @@ DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9
 DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
 DIST hypothesis-python-3.83.1.tar.gz 564466 BLAKE2B 7b4c00a46b5a547bfc98711b795525c09d91ed41ac2c1dcf9c3c571e32819c77c6f6a4311ff32020a6d8e837dfcd03f7e2d842613148201d476615831483a737 SHA512 d828dbfe8637b6388b8c77af08970c2b45cd8f6960f26b1c54f3fbeba012e225d116802cae70ee28321de9d961397e60a5ff8cbefc02d085b6f6978f6bddf56e
 DIST hypothesis-python-3.85.1.tar.gz 568995 BLAKE2B 65297e73ec833beee05f7ad4f137cdbfe1b28cc478df31fedf8fc2c5183e70c10d5254fdba906842551fcfb7280ac59b3a7dc5cf752700c770c90d158cb81324 SHA512 cf6951d8cb70539b57147f422e43296518edf416200eec220f0c3f258ee6215f858e496f66b340ea68d1754cd936fc26a4ce4d1ee7a38cf338398d316c06cc24
+DIST hypothesis-python-4.15.0.tar.gz 1175925 BLAKE2B f3e3888b3f4e542d567bdaad2582eb23bd8ab2e218f1bde82ba1639123f32e8c147313c22b15781d8986574813b5f6eb7c23ce28367e86bb304d33a23f179fa0 SHA512 7d9788b351196fc20e66e210b7d60b4ddb1507b85cf5a29de228600e07f676ccd1352f5d2ab0820b3c8c1a1e8ff145225f00a25aec5f325cc7405ffd0dfcd9f7
 EBUILD hypothesis-3.59.1.ebuild 1159 BLAKE2B a18bdad60c3f21181fa9faa44960e9baf2a6a44600ec0b2f71705873b088a715aecb560705ba0d2123cf68302905db2f17b92c634624517e04d0e0be19b636be SHA512 7271928ef2191de6b3cf64ccfdd59082da60aa55a362176ee927d690f7344b3e9b97592550efb2e6ef2e95e1a5f730fb2093a21ee2c7c14d0e8381da5acea4d1
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 EBUILD hypothesis-3.74.3.ebuild 1586 BLAKE2B 77cb7dacbc2292f9787c3172e1f880ea808ffe4ddf6b2a2adc7f69f9e6b7392b80d7d1c6c1a95378d2bd739223fb3e9881a45edb0f4151f3bb955b36053e1e55 SHA512 adfb3248a6c06e01ad408253bd4342149c51bb5540db064c28218fc1e140fc44235608ab7b2740c804ea74aba34c385891e980f330f965645dfcb18212cfe0aa
 EBUILD hypothesis-3.83.1.ebuild 1475 BLAKE2B 4b318a70b04fb5178eabe75a5e211405de6ae53238ee46f5f33ec5e074cb452290c941b65a607dd39257e5cdf491ebe72ff21de8ef869cf5063c5effa4df5990 SHA512 99fc201b4255b30085c82ba5c5709aa23c1867f7439236695f4dd960e2a0065dffa6bbf20ce29ffd0608b8ea7bf63a8d23387bfc5fd90b2ad4b65f234f71e2d0
 EBUILD hypothesis-3.85.1.ebuild 1475 BLAKE2B 4b318a70b04fb5178eabe75a5e211405de6ae53238ee46f5f33ec5e074cb452290c941b65a607dd39257e5cdf491ebe72ff21de8ef869cf5063c5effa4df5990 SHA512 99fc201b4255b30085c82ba5c5709aa23c1867f7439236695f4dd960e2a0065dffa6bbf20ce29ffd0608b8ea7bf63a8d23387bfc5fd90b2ad4b65f234f71e2d0
+EBUILD hypothesis-4.15.0.ebuild 1477 BLAKE2B 093950f3e793cd6a7ff1bf58a51ee4fe1489382eaf7b4a87542ff6a8e1eae281ae387a2728230afb4de7bcf8ae978613f8273babdd2cbb31fb9240059ed7d0a1 SHA512 8d512bc9e4d6326654baa79fd2320631b7c6df1728852902dd7f452f09183ce34e8383aa3e6767cf00f8e189b5f590877382c498709101ad20cca02fc348c507
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-4.15.0.ebuild b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
new file mode 100644
index 000000000000..b3f2ee27292c
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+python_test() {
+	py.test -v tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 886e71ba739a..a3903d82b4ee 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -4,7 +4,7 @@ DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f
 DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd05783724dc2d10fccfaf11ddf1a17048c2695477bc1f4cfcd6d08ed48b6d552d19862a0510d8e12fef4e17b13087b SHA512 62091fc304ff0d4a1dd5db3e1fbae7e02edcb60442f19d7408ba2f115226a8282ff67df55334f019da3cccae858cd5e4b0c0ece22a7c66768bbb85018728be30
 EBUILD keyring-12.2.1.ebuild 1017 BLAKE2B 568cc5619b1b2645c999d3175720469157ee2d55955b8364422a2bf72c8d4631c24e9bc71e0ed3db1ae625810e8a5cb0c33fe6ade88a4859b1e4b8447336fb4e SHA512 172ef757531fcc524676747080b0a383c11c54dfb48180aecc6d82dabed7f803766804703aa726a4755b4c5df108ce6babb56096ad4cd325d71a17a877af242e
 EBUILD keyring-13.2.1-r1.ebuild 1184 BLAKE2B 96c4fda0e3a375cca0bce279edf12f44f5fad2164936928d049f77e720b969062e4c829cb097094c6ae3e138ca1086c179249162c33f8d2a7743a1d454c7f51b SHA512 b0b840ce19a4080a4e6eb56b70ee98d173b7086808e70ab631c041396956c5fdf7cadc8a1d1cd456527984cffd7d0e79191225fd5823f154eec266eaa1c10b18
-EBUILD keyring-13.2.1.ebuild 1019 BLAKE2B bc4e761d749dbaded425683e054028ef234bcf7ed33722b0dcea89eec54f6a58dc6d065657df8af185795651ca1c5e6b01b23b2fb964aee8ae4554c771196f50 SHA512 ac5b4ce8872dcc73b36ba8429dee0af9282e3fda7ea7f33661809b033ccaff9e064562071402fa6e43bd8bffb07cb1dcbe08277eda1b15b96aa86da74b9ec8fd
+EBUILD keyring-13.2.1.ebuild 1018 BLAKE2B 7f0d00720ca9d14d8b62ae49c4d8509fdd46a7e8563cc9caeecad699793f54584f9ea8b8fcb55093f72f6b574d4ea1d0dfe1cc1b19248cf4dfbd7f3ad9309084 SHA512 a9f1264af8be6c3eaa3a3499c0ce4f5b31c938c50b015da9c04cf57292186825b7ae8ac643410e276940eb21ea9d8acfddb828bf8e50af17c8e461044313958a
 EBUILD keyring-15.0.0.ebuild 1190 BLAKE2B 5c41f74fe95dec4d8bda37ef215f77e921472d2a204e25631e47b56823f73c0d1f742ed9bbff8f2d2f36efc2c73bc9be940a889609cb5b7d28a9b24cf05da4a6 SHA512 c05684ea5b24771c121c74ccb3b526d555baee2f707a0e95a0b5d731ccf0602b647dc8a58ab0fb0bb0779561eb619f69342098298c719bd0894fe9ba1cf2c297
 EBUILD keyring-18.0.1.ebuild 1206 BLAKE2B c0dc73a01848272014ea98f38e02dfb45f272c126952f6f561356e15a6f20d596e70e388fef61db866e3277395542d10769fce65aff1e4a207484bb6385e6f2a SHA512 b3de38dc1b61139771ffc7fddef303be3c04f459d4af5358496c72dd381b35782f2682a11e25be52dd17912658cf9816db413d41122f8281b997359477eb568b
 MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
index 458f8acd5a08..04fb56339125 100644
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 58b278ac1e05..9f32b00faae3 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,10 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
-DIST miniupnpc-2.1.20190403.tar.gz 94204 BLAKE2B 6dd23a2b0b497a95bf8a92d63b95b8d3c85074845d1f2d9380701107e12262cacc2e80d4c324b95aeca76412ec85d5e6118eecc2131f352c8f2a5d489f833d40 SHA512 810ece8f3679c8caab447a621a7bc128a2f1780b455574d3514933c0601223cb14033e97f8e667c596632a75f651dbbb0294523d873e8212fdb5fd3cef61e65f
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
-EBUILD miniupnpc-2.0.20180503.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
 EBUILD miniupnpc-2.1.20190210.ebuild 752 BLAKE2B 6f888e83e28f1060812f5e464f3f09e0ead876cd8d2a3feeecbd184823b7f3d347bf4a9bef20f16f426b323e607c0195ff1d7f515297c070cddb52b1d817cd28 SHA512 8409024efe04b785ec6fee373e014f6b619414fc3c7151c4c4255103e9de1971e9a4c5a4b490139b9cdbee01e2b573b0067a3233c3ab0f8bf2fb004e9b4960ca
-EBUILD miniupnpc-2.1.20190403.ebuild 756 BLAKE2B 7979b77b8bc3245374322e59dfed7907cb867cfdd52b307f00a38ebab6409899b9d578412bea3942d43b419cf77d0f522097afad0756a1c4a8c3a12262728fc9 SHA512 ccc13cd1a65667178455b4ba0ea4c549b173511811385dec71c319c161a15086b6ee433c63bc3f400921878d9ec21887a6c774d5835c0d32d1163b289fe4f3e7
 EBUILD miniupnpc-2.1.20190408.ebuild 756 BLAKE2B 7979b77b8bc3245374322e59dfed7907cb867cfdd52b307f00a38ebab6409899b9d578412bea3942d43b419cf77d0f522097afad0756a1c4a8c3a12262728fc9 SHA512 ccc13cd1a65667178455b4ba0ea4c549b173511811385dec71c319c161a15086b6ee433c63bc3f400921878d9ec21887a6c774d5835c0d32d1163b289fe4f3e7
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180503.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180503.ebuild
deleted file mode 100644
index 1fc60e04a6a8..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
deleted file mode 100644
index 4474c7bf0051..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190403.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index c031fe370094..eacff574e7c3 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,9 @@
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
+DIST more-itertools-7.0.0.tar.gz 70103 BLAKE2B fa7556019ad4c2e8905698c1295840176b763bf1b7356679eb3988112b962adfbdefa82e7ca7419d350b40186a3ec5015314cdd7229dee867bd03fba716165f5 SHA512 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5
 EBUILD more-itertools-4.2.0-r1.ebuild 1053 BLAKE2B 2f4930c83f7019d047f476c1448a48da4adffb10c11555bcb4b69372c5b0535a5d8f3658fe356efd862099583dd3c65e8f6e38db204241148f4078f6c50ca09d SHA512 bb1e39fcbb7710ed2df2cfaad472ea9fee38a5df9495e4a4d11c99827df830b6de17da83262aced81d51ad0162a247872ea20fc6046e3788f829e56891ee6544
 EBUILD more-itertools-5.0.0.ebuild 999 BLAKE2B bc131529830522873488ad55b801adb049c462a5300e5c246dd46ad310bacaac659f3b9bfa4a6563bde050f8e44879afade9cc3134089f437bd12042f7e80179 SHA512 493927126226f50cd1659eeb4c9d884b79a1672c2bdb6e0057d722e6bcad0457066adc13e43e6a31a2c3a6e3d7d744cbfd87ba3832d84327193e86ff153757ec
 EBUILD more-itertools-6.0.0.ebuild 929 BLAKE2B f300d8cf244f84321e4936974c93212a3c214f8ce044fc7584722999d8405b090dad0fdbcd7b4b6b676a1dbc5b1e0677dce2012c3ea724abf984dea431743473 SHA512 3ef6b99b42c86c04d93d254365f96c43ad12ee17d3f1b6806c37009e772c51e4f421ab05918e6457f4d63a9437e6e360b3a8fd288c9bc7c96342ee980d570e8f
+EBUILD more-itertools-7.0.0.ebuild 927 BLAKE2B 2030c3ca3a2fea66c4488aa099e4787c2f8ad7748ec913400c0f943f85c3e461928dc2267e40d320e4b5892ef75b63b92afddfe55cbce5995807e6f2a9d0daa8 SHA512 f582a267356be92b290005e05483fe67cbf480471c31a6cae3c0908600010263560bb0eb78077d7c1ca4203e06029a5e09aa95d1c0986aba4b3d1f35d60bd0bf
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
new file mode 100644
index 000000000000..9068c6fc5125
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-7.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index cb0709e67771..83db0cd97d69 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,5 +1,7 @@
 DIST munch-2.1.1.tar.gz 6565 BLAKE2B 81d0ea79df9934ec4fcd4d650dde6822258b3dbaaee8b114cb445219c89b76e40c7aaddd06306f9ba585081b556d7fa32d2e002de8bf5c071b0fe361092cd18b SHA512 5ffd78b1e062f71c73047a03949e6cddcd0eeae3a0ccccf36687140d12de9eb29161d2891a0fa2f1e70dfbc2b33c4ddab5d8a3611990718330c280ea769e85c0
 DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f5114d3b5f5253bbd1bf92a860d3b030233f85878780d33ca171bd08c44b37c9bdb538e4be868704861c4372f SHA512 420b9fe4486aac00b3a0d747995df46bb3fc72a5bcfa4fadbad3e3a50431493f69ca76294ae541042aaabec6e01794f8f3c9c03a5c0d6058e730dccb62e42e45
+DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 EBUILD munch-2.1.1.ebuild 486 BLAKE2B 61a2f243cd796f5b83a3402b56dead28bd309e6c67c276a7ffb8bf303882be13d86aa6ec1952850e6f960ec728f84d4f496a6eaded8f7541eb301ef50e671932 SHA512 523651634c947b4aa0f08800bd9fd01607ce6d7db463ea7e61958e12b7b4b204165a58e6a2592e25cb0c584f59525fe1c8e810e12e2741f90b67114425db5984
 EBUILD munch-2.2.0.ebuild 491 BLAKE2B 9cefad9049dc438835dda27b4eb7f23dc6f9f420e9186f7fbb83599906875ea4b02b77ed656efe0900ed7cee1895f970c8dc1e71acc9f38c628fd0d0e65b8b66 SHA512 3fc441d774c55441920797216e58e5391e61a8f27cf966a9b37aca861f1207fa3f2a04c5bec231cc5f670f12e3edc28712f04c3b8d4109e004e40a74691ce80b
+EBUILD munch-2.3.2.ebuild 523 BLAKE2B 4b23dcf86fa7d28c9083c618d4e4c611f4f456b3ff98f4d652a9ae13be8d5feb560ef11eb964933447a4264f270ce424226a62332e60666548b27ccd6e0aebbb SHA512 660efe1f691e5677b7bef5cbc4f19d8f259c9c26e5698a76abafcebdc512d7c549d47dc08b2eb212da56cda1a901288b67f0f69c075219c7b168d8b4df877a41
 MISC metadata.xml 348 BLAKE2B b02f6b0b5a5acc47ab4d719f9b70dd7e6a8c5d1694d374fe5eeedbede01105160c91226db47d08cbb5e290b9d57e1741b954f8c36a52d69016b8013eedd470ef SHA512 1787b144611cf1dd895b7a822ec2c5ef81e523f277c3394c4e23de466d11f1a4e22bbff019f92383de6b116ca911eff0293b4945c18d0287de07bf020303bf08
diff --git a/dev-python/munch/munch-2.3.2.ebuild b/dev-python/munch/munch-2.3.2.ebuild
new file mode 100644
index 000000000000..1820af62ddd5
--- /dev/null
+++ b/dev-python/munch/munch-2.3.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_{5,6,7},3_{3,4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
+HOMEPAGE="https://github.com/Infinidat/munch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index f84fa292e063..a5ce94784f85 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,7 +1,9 @@
 DIST oauth2client-2.0.1.tar.gz 153127 BLAKE2B f7e7ccbe42effedfb94abe4f78e2ea02867aa75ca7ff794d6db6cdb2e039d4a7d55df79df3a7f8777be215fc4aafb1dda08a23b81eaa66d64c9b2580045c158f SHA512 66179a604418a8aee9ca9dbfc5ad18356d5130a588e85f4dab3330feef194af2114bc2eb18ec625acf791938e4d7f78ee55284f45a67a48c775676697ce2b183
 DIST oauth2client-2.2.0.tar.gz 167484 BLAKE2B 60c7fc941548874f436df094a94e97312983f88af8ca472c998cb7121662363793423d420fa3e7e83032b82a3fd22a76f9331a60e3099785ef82d3fb5a781356 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6
 DIST oauth2client-4.1.2.tar.gz 184731 BLAKE2B 09ae16a94b1f6b3eedb02ac10d660d8fda78faa82da5fed75b2a40308049c7d78951d593352f2e02c7bd9255e75b50c20996d12f451c20e1dcf2c32f54008b07 SHA512 908f0e32f0ef76c3eb86ee34118d4100bc08fa34aa89c561793bf8c55078f07611935ee6aecb6d2ae2f7e96a18ac3bc25af0321fe564f26042ff2bb5eab30b18
+DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
 EBUILD oauth2client-2.0.1.ebuild 1121 BLAKE2B ad08f30627a7055b827652dbabff7edb21355256be854b7ec340d772f67148b18ce9170b5843ca013c51a33387a41de35c61aa5718692eca750c0a5dfbbfbff9 SHA512 500f6738904d42d44684ac4857c6c45abdd978c94eedf3ba30f1fa17c5b51837bd1a7fe8559cab6b37fed2b03af5e4f931af961375445c19cee6a56fa75d2b2f
 EBUILD oauth2client-2.2.0.ebuild 1124 BLAKE2B eda055c529bbbc5b648a20a6039f25cdbf324780a6a64f98cda1f7f52ff1e1ade128859c2d59621382f7231b711891e9b71fbf29c09c418c087f21fa6704ec6e SHA512 43601344ec3fa8e34652162c983408aefda4b62c0c3c96fab3478005adba4c8628fbdbfc1fdff068572684103a9fee1a32147be9ef0815320121b3816aa8f4b1
 EBUILD oauth2client-4.1.2.ebuild 1703 BLAKE2B eebbc951e573a3c4b232144827f2afc4fffdd8caef2dadbc808a95cddd9acf47a4b16eb7cb84f51ca00cdd366517b7e1feaf0bf349a3e10b866ab435e339a5cf SHA512 1807ee810a4e1f89ac458ac3d3e13cbd0c7d1ff814c44a708355cb67b219e2816feeec985fda6038536af6363bee18eed8569d02318de6c75e4500211d5d3b66
+EBUILD oauth2client-4.1.3.ebuild 1704 BLAKE2B b2be52869cc1038384ce31961f449b13f244fd51b5e92ed714eb6fddbf03b3422767def35c9d6025b5e24e6b58267c25929b952f298b8d52e6a3dbc6d002e5d9 SHA512 e3186bf5c7d7982456c5d95c8632594dfec8a7839d55a3348e826fb07ea31ccc71b77a91730c5850ec636b3a679e1e8361e5a1a13f625af3513ebe4c8e75ba11
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
new file mode 100644
index 000000000000..fa592dcd00d5
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/keyring[${PYTHON_USEDEP}]' 'python*')
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+python_prepare() {
+	# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
+	# oauth2client -> keyring -> secretstorage -> dbus-python
+	# https://github.com/mitya57/secretstorage/issues/10
+	case $PYTHON in
+		pypy|*pypy|*pypy3|pypy3) \
+			find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
+	esac
+}
+
+python_test() {
+	nosetests -e appengine -e django_util -e test_multiprocess_file_storage -e test_bad_positional || die
+	# appengine - requires appengine
+	# django_util - requires django
+	# test_multiprocess_file_storage - requires fasteners
+	# test_bad_positional - expects TypeError, gets ValueError
+}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 65abee70803a..a10e82ba1032 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,7 +1,9 @@
 DIST openstacksdk-0.11.3.tar.gz 693350 BLAKE2B 6e5edc27a2c2d35682827fa9cf15a93bdc7cc5b5fcd440d15f7448a52fbf8fbbdb0f0f528828b23cc9585b72bde2d1537745c0176c8d117ed6fe7d40c6a01c56 SHA512 140d69d853e7e1049f2c539267f9199058b6f5a9452a80b8a6361efe70f42f07a91d94935ef75e43591a5cf70e8102aed31570c559fc89d83ce86ce26fb54d44
 DIST openstacksdk-0.17.2.tar.gz 735020 BLAKE2B 01cd0be40c2b7c95678e03d50d74125674cc70a190b6db90d6769aebb7e662df1e6cd0ad12f92fb617e0109655cf673ec0d21f19a040dffb4f72350f1fe8948e SHA512 c6608df8a618730f4542a7e01708acbe116729042730e2c7adf15c3e1186192b5b6a7fd39b74694290245d31b58c40214df73ca231547ca409a768c44f80750c
+DIST openstacksdk-0.27.0.tar.gz 818981 BLAKE2B 6ad4bdd75e9b6af8da256afaff4003b233164336edef1edcc13fef66bfc25eaa17f02cd2fc1cd57cc27076cc05d63dd646200fbbc809ccff48c5477bcf8178e1 SHA512 3eb2b26dfa37713967d533b66abb27ac107524bc48c5fa7d475fbcc58291e7531518226acdb1e0c20537a24fc6008e287545d61b40e3f1104c80a04df014d566
 DIST openstacksdk-0.9.17.tar.gz 335611 BLAKE2B 2f1ac157c957cc90d53d97dad1930a2cab7dc40c15cb76f22394762eefffa402480a8fa4b9fd30358690b401e2d362b4f7e29b8a17d0e7ef87885256d1d62bcf SHA512 4699e80ad68896cea709c861b013404234b1d6acf2fcd8bc4e8b21b8841f8c204e693c4e631a85906b5b415404cf50f35f395df6206e471920c68d2f26726696
 EBUILD openstacksdk-0.11.3.ebuild 1421 BLAKE2B d2fd63cfb96a71cf38f5d2c70f07c426e9df77caca94588561a7b7c95e952f184f30c02aadb43a1aa30cf6ac17ef7ea568a74a69fe7f88f98b4dd10739ac51a0 SHA512 ca2c3ad5f91cb2e4dd0aa585709ed4c2f66d630c85251a12aef0dcc58f9282efa1b102e7707f456fadf07b26e4a1d6a5e76cc6d06f65a59c28d4c539c4120326
 EBUILD openstacksdk-0.17.2.ebuild 1472 BLAKE2B f91ab28b8a8dc4b1025be9be2a9cca9080fa9b454736b38b535a4f5aeeafb31381f5c0fae9612c8d96ff1ed63afe53dfccd4ba88a0f12ba333e549152f83a6d7 SHA512 19d26704e236405de4096361b2136a18bb3d997bf5c86ea0c2a2dfb0bd5e6671c20203b7ac5bf3a5f65fe88779d157c5e535575b6a42905de854db76cde64d9c
+EBUILD openstacksdk-0.27.0.ebuild 1426 BLAKE2B 5de93c3156350d10095aeb9c73df349452dc56fb19cce4b187bbe8b40ed746e27c1ec45f8cf16777e2ddccf3befa931cde3e0b06e40459481d9fb882bdd9b8cd SHA512 8b238e474e1cd84bde28b16eaa8236c8d22333178d684295d6c28a7e823c2664f1ae90726fd7951becf0e8b33bfa73e84c64e600fc7b2a09e25b50cbd6280a44
 EBUILD openstacksdk-0.9.17.ebuild 907 BLAKE2B 5ca73882937e040c9faa12235c9e9521dba18b6352263aa04118f03a2a20ba782187ce2d00fcd98ab6f93c02828df74f64e04bc3c726a211dbc320bc40c04b33 SHA512 225f9e9a65d17c1dbbe7d140498a2287e8b485d289c17732b482ee4e0ad942bac96c6f0ff211604f2af60cde42a5f8f29778c0b309cbb53b859d122078036a32
 MISC metadata.xml 532 BLAKE2B 6432003077d4f17d035396d83fdd85037468296b4e58c7e93a773bfd99e1d65144d88ef93709e41fa5618a300fc1c9f2e85bdb3f8520d5ca2bdbb4a9520003a9 SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c
diff --git a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
new file mode 100644
index 000000000000..d5e9cd8afb78
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 9a1a3197ddfd..854978f19618 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,6 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
+DIST os-client-config-1.32.0.tar.gz 48162 BLAKE2B 95f70717da5ad85b4a691bd89ca38989713f2d3654eac18c7b0001ccda8eccb266bd7ac3a25591d649af0814f8c97b718c88d856498e5042a07ca9920b6fe52d SHA512 2cca903347df75e18a0aab4244dc325f79fa7cb5a25a382ec7081a30d7e2c6ecbd5025d58c20873ea851396169e2b2c8253b0b77f6189a311016e57f8e065329
 EBUILD os-client-config-1.29.0.ebuild 893 BLAKE2B 55d489e118c1786d67d316d101e25b833d053fc67d4851abe71541541d3d21b1832deffb825a748b96ac9f7e7e5f0bf39de1967b9b0eb0def9836603dd6ed7c9 SHA512 9b8bfd6f50e6c9d27487e59f1394bee9a12b2bb0f54790e32bac2294bb34e82445c66b50b6910a1233e86fd817755a1dfd74cf9d164e6a40e373b8efcac42472
+EBUILD os-client-config-1.32.0.ebuild 747 BLAKE2B 48e6f97745a4d744efeea92a182e6a743bc825782f26207fef1f82f5e7510e020271cebd6b743837412377813a026b5e6c4ee8142b68ac7d7822bedcfffc91f6 SHA512 bb702e1cad08fe140e7e9ba626bef85e8ab69f8aa2dcb88ae745b25fec63a9b3f460239d341e06fcb7305337d13e2f22ae00ce6ea93a53d112c69173160a8c05
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-1.32.0.ebuild b/dev-python/os-client-config/os-client-config-1.32.0.ebuild
new file mode 100644
index 000000000000..87ae19a12067
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.32.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/openstacksdk-0.13.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/test_get_all_clouds.patch
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 81fc67ad0a8b..1c6d3c4d45ea 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,7 +1,9 @@
 DIST osc-lib-1.11.1.tar.gz 89065 BLAKE2B 4410cd9033984a671cd36b1788f7dfc57321aa1303bd5dcdfd58aa394184cb936cf8af88fbd5c0966f89f671138d91d47b0e0cf42f2930d88e2ba15d744410f4 SHA512 703475a0ecf5c9c8b1b9fda1f2eec6ce544cc0862afdb3fc3db34ff00e9b09dff6b43907cc376d9c6ca5b8e56ea0e22b1a36b4783588ffe9ae8c43fddcec9c10
+DIST osc-lib-1.12.1.tar.gz 89641 BLAKE2B 06069dc38e72c2c008c730cb7a30279762c213b2715e70786e6d293a3087d9fe7d0b3b3a04fa343337bff6721d32bf25a35920e12dfeb03368d1308fc0331f12 SHA512 0b5c2e1376ea078f0641d3e2b69508539531b2d369f2171773ad5d44ded6f25112c3b0843dec11c481afd51b2b804d4e56736ae65a24ad4c59ab142b86da678f
 DIST osc-lib-1.7.0.tar.gz 81917 BLAKE2B 3a87d42fb8baed7096e01e591d863097d5efab63fc36f0245b5311fa52a0f952a3a8a52cfc964e14630009aed7922752e7a0c5d9aeb1da0d31d7caf40c3a9a44 SHA512 a3dd3ceeaf674692fa318809b190df30d1d6be5b59355b8f0b5862f5b220452e3df0185415b35ef596158ce010b47bdfea24e5fcc3d957d38a2a89b8a5905bcf
 DIST osc-lib-1.9.0.tar.gz 86263 BLAKE2B 23105d3e0a327e0c7a9d08be59ff70b510528bbc26bf8b5fad0dbd6bb53e96773427ea4a0a6fe069ffb8270ea001e767d2e58863132938398a0d9c99a427f13d SHA512 26ade2147f5e0f7c02a2ff0ca1e0b2c369f6cbcb7d7843c4df09e5c5ae9e5e6eb7001cc9232723b2941b956fec1c7ae34457fd8ba7c45056a185576cd8abe2a4
 EBUILD osc-lib-1.11.1.ebuild 1185 BLAKE2B bbd27d268d8a1707a2f6bb15cad6545a26076be5f144b38fc2fe7d5573afdb7398c9ba171b8b86ab136b0ee62ed44ec8cc91b56b782827a489a248c82532ab91 SHA512 c1b96fce8cc8d26a8cde9c41e01211c3e2d92647b8b41406a9568494cae165c8e5d71239e50192e32f49642c9e4a762f92596425a5bf882252210a4e0206141f
+EBUILD osc-lib-1.12.1.ebuild 1186 BLAKE2B 7ca5a16ce41c19799629dcb9a27c9cadd58d950a6400ac1d518fc334e3d15472b5f4eb68f247772f282d7e1d7858633a070b01de65b56a0e094622831137e380 SHA512 84f2ab34e608f4f3104003ca30d7ee590a0931edd926b246e56b210c17ef5ba5e09d9622e87de2f0fe2207a60a0454bb6440d3595cf9f5f15bf7c10d2ab25a46
 EBUILD osc-lib-1.7.0.ebuild 1141 BLAKE2B 7e753ba5b0f26d9ecd23ffbd01df0d33c5331fae27e62697fc7055ed16a5e3e17df2a63aab6e69a212b33838209de3416f21c22c9348a17a34fa0dda89172dab SHA512 a4bd61de7bb5cb0839ea8c391c9d9a5569e30e18e888782a7f62144bf5ad37768de56ecce6deeb5e115c7c32729e449e791f09262ca0610ae12d4c60524c87a1
 EBUILD osc-lib-1.9.0.ebuild 1185 BLAKE2B 95adbe63e27fe6f73e9fabaf5330e3eca3b60ad7720d8b527f9e68289e2268d6c25bfecaf8545cfacf7ca6bb316ecd92664c942ed726b5956326e1a1b1301755 SHA512 42af37952821333aeaa295d9465770bdfa41bb4f016f6fc9c26262077c649222ac7d27502336d0cbf2d307a3f2bc4955730d8611d70e852f5b843997092c29ed
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-1.12.1.ebuild b/dev-python/osc-lib/osc-lib-1.12.1.ebuild
new file mode 100644
index 000000000000..1835d2e6f431
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-1.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 354ece3f8f71..f80bed3f666f 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.reports-1.26.0.tar.gz 48691 BLAKE2B 670c3c7205dd2ceba1559d296cbb697045aa088f7343614e82c9c5983166f34e90af33de43c55b1d865715c840ea3a12fcff697a798a5eb0b2a120a39c4895c8 SHA512 e4a8bb5cdfaf1cb82f53fc56060f2e6bfde85ad6933326faab2ce8f8181231510700712d191c1429cb264f70a79695a069fe9dae93aa4a70aafa3efe37898603
+DIST oslo.reports-1.29.2.tar.gz 49597 BLAKE2B 4c5f76fce7075fa1b9dece5a617d2a198d04386ba03513070b700a5794baeab18e9266012b8f10d232d5063eadf8467f0169e670fbd6dbe7e2838e34cbed4bb0 SHA512 92ba14a445ae0a12454c8861f43bcb2aed9f07373008b0246dd10a6a650ac22be8e239365441e6b192d11d09506dd51a4c2e4a6fb54560fa46175b0f085c4fb3
 EBUILD oslo-reports-1.26.0.ebuild 1298 BLAKE2B b9ab306c531bccf5632f5ae7cf934780e04c95a8b6ada6ad25f6da695d1b6a9c0a881d16eb7e6f2fff312883264ceb827092db458a84f254f8605e1e48cb6f1c SHA512 f7d56c30d64ca5c50f0ced3eb23b7f94e5f56733e345cae825f1db52adf6c8a5e4f110572c1b0588c809e035afe2f493bd5b25fcd7021d5a6e0eea6ec1d62a09
+EBUILD oslo-reports-1.29.2.ebuild 1080 BLAKE2B 6c5a997aa4a5c59bf0b276a48b65711b927290a177b01c7570b6c2e2c621179caea8a2f8b76c57cd5bc859729187437b1df281d47bf0183aa024060397c1c4e6 SHA512 366fe142d0323748a18ccd498121b4f436d4293765739bc3a5508aadeb277d87f07de74f07d3d0fa2393123733ed8234b13719a05135d931b0c0593f7dc765ee
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
new file mode 100644
index 000000000000..6b6939d5c2ec
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index bedc1ff93ca9..2d44a85b5948 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.versionedobjects-1.33.3.tar.gz 150086 BLAKE2B 7248c5cc114962ed33c70a3c6e9698ed784a2a995d949830f5e8f3f97953caf793a37c60074e848e8c4518aed2de29ed54ae637166f247bb7e6f95af0d9c6e87 SHA512 0d1d8654b1f971bc922d57771c159608d30fd7474448d425beb7c5a98b9810c6796c7e0b21436f75a266f54913fb01ce6b8e8ad4402e09453b797854f9fc4575
+DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
 EBUILD oslo-versionedobjects-1.33.3.ebuild 1360 BLAKE2B c3dd38aaff1eeb2bc8c10224a790801f8113f568cbd667860fea21ebd84f5e336379b99ffc995b2634948741e037c0bb96bf5697189052853c3d5f3093a72d59 SHA512 f05336a2f42b51dded28c104f644ef333423483eed54b56a54d266a91461de1a2178a1b2dbef7e373cbd9d24c7ef6a93afc7e6220280327ead3b4225f9b9dfdc
+EBUILD oslo-versionedobjects-1.35.1.ebuild 1361 BLAKE2B 5e1ba6fddbc22945b6f1e4667d993ca73deabd079b01b32ca208976bc7cd5d853965fe31c4067ceffe75f818de6dbc00d17bcd72d6c16dae8d472ddda14271e3 SHA512 07d60ebe3b2981c088f19b4a776d4d22738f31416b0d1d04be3956065b97d3f3cb05e95811820509c2a5e4a959bc18030b061aa73423741b2bdd105041492021
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
new file mode 100644
index 000000000000..626422bac715
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 1af809e6d17f..a287ffcea38e 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -3,9 +3,11 @@ DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b
 DIST psutil-5.4.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
 DIST psutil-5.4.8.tar.gz 422742 BLAKE2B 13c4b9b412704728c4b192032a6be78756b03a37cd6f425a81a83d0aca4ce155ebf24a1f62b75e66433f21e8bd3f2fa3c7bbb5ec2686c6dc951b89e97ebfa688 SHA512 5691e7e7ecd827aff2755a85c4c1be3a23beec3a1dbff079547991dcfffa8e075cff7fb6983e1f6fa287e2216e3b1466618730afaf114a0ee209d7b70d7b0c6a
 DIST psutil-5.5.0.tar.gz 425058 BLAKE2B 0a13149b060d1a99faa600470fdbd592ee520b247f916313bef428feaa652bc4e9152f09ceeea5378769d4cdcd9876ccdc96dc4378d74136bcbcadf4a9266b90 SHA512 e614d41162087e236779738b50ec9e83403082f20492e152605fe80da23a11a4bd667db82a234f00815f68139d53b19368c2118ab27d52144341c2250091c570
+DIST psutil-5.6.0.tar.gz 426596 BLAKE2B 803cb09262575a7193ecc9cf9bfbbf721e10ef4adc25672f6747111306d1803c1422c9894636421653eaae11c241100f58837c80173ab473bb9dc39da2580aed SHA512 01daf80698954a53a9e987afad6c7aefad502c76b5f34601728c3864c924ca52099f139242e508fd4c72378cbe436c9870eca7a33c112fb8dead0be501aaf2aa
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
 EBUILD psutil-5.4.3.ebuild 810 BLAKE2B add86bcbe158a1c9b272198c7639b870060c19e1359072cc64d286ed92182f4990d25dda21be9595c4d487624eaecbea074d89aae27f5f97e7edecfd844b3c05 SHA512 20c85ada79b763349f26c277fb157413a35b56bd5d85fcf4c2f1995ddaa463c29bed24e04bdf2353dc85e9afc7a39e874e2a244b25d217b539e227fdb383db02
 EBUILD psutil-5.4.7.ebuild 918 BLAKE2B 099a4f9a6a2fd33e986f5b57f50847379c5ea2e1e964fef90efb5134d803c4977807784b986fe1a753b3062e2f1c21db2bdf54f574b86d814f79a28c4eb4295d SHA512 7b3d0b83a96eaf4efbf271c47fa7a4b3981ea2e72b252871daa0058a5b6018a2f244ac8d1df3ef95207b3fbb7f649762cf144e77308e4fb274b318397325f208
 EBUILD psutil-5.4.8.ebuild 932 BLAKE2B 2d7fc8e190f50371887422c918ec8e8d24fe4fb7bf73c89440aa0fb77aa4f4d8c0b0e87f5fe50c120a08f841daa41cde393fdad4c37e280f61fc6bc12794564e SHA512 8b6a3f6e55276400aa03a39ba4853582dbae7b099ef4b956ab734b44fd974ac271ac0ccd00c2a88321e102fcd53ec89b77a3999a6e5fd00ac650ff63964aef83
 EBUILD psutil-5.5.0.ebuild 926 BLAKE2B 8c65d6c65ae9f624dfb6cd4b45df1c444a4051a7702f5f629847f118ae21e60f203c1ae96160f7d7dcc7fcbbeae1b623f9f74ee49fa022a011775938cada3db5 SHA512 2596937b9ac132b9445fa5bfbbfd3385e25b8e239dc1735739d2cc63c61a25fdfd431c7222c1169017a633cb90d8b39192ef60f0a3fe6d95fb12e09560ba348c
+EBUILD psutil-5.6.0.ebuild 931 BLAKE2B 86a4093d350671bbb9061a24e245d1fdb9833e5575ccfa9dbbbd44c3b010dd524ab40f26befaa1a53452e6ed17afe4dbafad104547c19dd24dc2bbf687ba98ab SHA512 61bb34ed50d8ceb22a1835e3f9a4db48a711fb84c9731dde6fc5825b1c841e23c64b5e0f8697fcbc086f13fd2284444680cf04395d146040d673d40fd4d837ac
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.6.0.ebuild b/dev-python/psutil/psutil-5.6.0.ebuild
new file mode 100644
index 000000000000..2302e7cc42ac
--- /dev/null
+++ b/dev-python/psutil/psutil-5.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	)
+"
+
+# Many tests fail, even on a regular tox run on a upstream clone
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/__main__.py || die
+}
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index ff4ffa5bf65e..a97a0ec48cbd 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-flake8-0.8.1.tar.gz 7359 BLAKE2B fd45d50fa68e329569a5964407fae301075907aabf0ec2c85c7ad9b9c28aa7a92acfaf9b7b4e06036c940ca6c7a35388cefb0d9b9151471fe98c968a43cf5a95 SHA512 b49b4d42712040492161f144cce807b661f2d8fe5b484b29ad1a519fd5b0b0cfb6abd42c3ae8999f21263c4776fb773f91bf0776971b6b6727607d33fb49ca89
 DIST pytest-flake8-0.9.1.tar.gz 7959 BLAKE2B d0ef55385dbbf47968abdfc14e69a0420cd52bdf65c0f74ec72abeb1ab28ad27806593dd592f448f3c01dcdf29af4042c1e1c8affde46a1405ba7b4155c174a4 SHA512 eeb4f66022e367d92dee94544ae8fa99b79c1de0579a80e91c22e6f050752010cb7ad6c24094736d23ae753615b186a957b8b0f94c09754005183a971a1e4aa1
 EBUILD pytest-flake8-0.8.1.ebuild 609 BLAKE2B 9decd2d23e8aa8abf54f7aaa0d03a7197720a36200fd2e28ca392db1fffde3180dc165ed09a0bbf936bf2d15bd757c7f6edd37ee2ffd68d11a893bd54baea043 SHA512 8db1450d7d26f0643ef25fb9223eace4f120d33cc026115170d3872110b3ac15154baf4ebdcc50c4a2bd9ed636bc0e8ba6ab0d1ba8bb9114aebd612e88de964e
-EBUILD pytest-flake8-0.9.1.ebuild 675 BLAKE2B e8e99db225150b857fa2049533d77e768a83c8ec9c758468b711beb42283858a1861ba442a0db6383864f25f0207dfc6fbfba8ca0bdf14cba0cc1594f0e0df97 SHA512 8eeb21dd7ecb5484716f8ac89543844b39b7820801f5a1a78195703da5d23e824124bac39c01434e82e81f2223bb9266ef63a24ef993d89cece8d87261b73a4a
+EBUILD pytest-flake8-0.9.1.ebuild 689 BLAKE2B e44a5658d7b0cf8422e5f469edc5ef938fcaaadd98704a4c644164bfe735e654b50f2e107572b894cf0ef69148da70b66fff14a3c1548dc4b72c547db82f264f SHA512 aacdf53dcc91a272b35da751240e3d83d6a931a207794a4e0b2f881b801ba01236f6cfa38652f9aef3802c67a8cff25e8a7e7f5741d6edce9be5cc5e5f0f4437
 MISC metadata.xml 507 BLAKE2B 75290d0db230e858a4b5b706a2636963a998c882631cd2599bfca3a1961a2f6304dd67b1fa2dbf5a278a86dda00a4c50247f400ff8573845552d3f11b2704595 SHA512 0f022aea078d7eb1b41db5326bf4c1b950344102f4b614ef095e20555a81032687a3312ead75ff33ee8f6dcc81984651dfc110b95113b8c4f2b3e57f52e97baa
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
index 9a229ccae918..eae886bba179 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/${PN} https://pypi.org/project/${PN}"
+HOMEPAGE="https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index a345eb5375eb..2c2386c34ce1 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-barbicanclient-4.5.2.tar.gz 112008 BLAKE2B 1ab2f361685809d5c87f52ec420390ba83c63c5357c9a62aff4528d0161766ab92dbb2934a90a70d810e7785f6cdc420347aee199b4157dd02a60553281bf762 SHA512 23f6b9d90d9488a9f072092716bd65f8fe42b01b0889061784df909d5e169fb264f1b71f11f8a3f48853522f3d17428e5c4322712e41a57059f7dd45d0d06213
 DIST python-barbicanclient-4.6.0.tar.gz 108979 BLAKE2B cf037b7818dc2ff5a04637a35760e7899c680abdcbd3ad87f432813b5fcae5bd878d2fe60a97e1d554d9001e29e6032fe23e805e09be2b719f3e31a4b5621746 SHA512 c114dc4b706eda9ea3efc961e1c30471f64e90f6e0b39271a5670e4e086e3e9dd26afcaa5fd3695187c60c30878bb75d10526d10a809f71e0310a2c05268695a
+DIST python-barbicanclient-4.8.1.tar.gz 118919 BLAKE2B 0c29eb4fb3b77d6ef69051a956db1aae8cb151d07156e4c888259888f1a9a6eac0be9e5339ac9a3dee9dabcb1c06c6e835312b47bec4338b34842e71546e3e75 SHA512 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
 EBUILD python-barbicanclient-4.5.2.ebuild 1009 BLAKE2B 83e2b251e1d7365245ed040f38a0e56500e0efca9b2f0a80c1c9836533d64654f117741b2bc89153f4b8b47d820f94d2d0ebfc3923c36579a6ff5a34ca0f41fc SHA512 e1608db93c75478c22036053209046debe2e7a6a070b1e875c3b3f3aa7acaab2675b7fbcb5111a55da70ab57bb92ae699b78ef3fd5c3a977dc59839370ca7cdb
 EBUILD python-barbicanclient-4.6.0.ebuild 1005 BLAKE2B 5a2210f256cbb850aa8e408421f4e2db2ab5b7a91f8254688ec5f041cfcaf5ce8b963f1182f2b74395844af22541fb0a12c0d9a0eb5fec5ab2c6f1ff3dea731f SHA512 c2c4de7be57f3a8a532944bf90ca52d3582a65d21fc83c1a6ea2cdb9034cd654660d593492228d6d0bdd519e8741efc4406418e6aa2f637bcfd3f74d744421c4
+EBUILD python-barbicanclient-4.8.1.ebuild 1007 BLAKE2B 54a44591217bdf7233b69e52479193fee24b8a021487921ae1404cb4865897e971434d0b5378febdb8bff4708e5377dab0557b31cda03c0b9c08709c85c703b8 SHA512 478fd1dffa6cb3cf66c42f5fb8e58119683a38451874f88fa41324a7c9dd7991fdb8143ee5f97c548e25709d0dd96ff0fb92a9665889c94c115897f6c84bae94
 MISC metadata.xml 586 BLAKE2B be3884c7ffa487cd45252e4737bbbc3cd460a0e6075b2ed38439d74c66518832c2739e1826cad8184bc794ac0af6441cd900c7e3f88fe8d41361f21796f6f87d SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
new file mode 100644
index 000000000000..8b115b8b5e20
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 2e50f871bc73..a6a86539ea44 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,6 +1,8 @@
+DIST python-neutronclient-6.12.0.tar.gz 290025 BLAKE2B f863826a531708fda1b9ddb43f8bfd8f66fbba99ce3fe4afc1135d20fe4718dc7f11789c3e75cf52089690ce0286bf5339c9253d1e7e35916befb52ed905448a SHA512 c7e69e263b37aa14b59b08ecc12f13210e1bd6f10cde10d8b4d5b8b9f912d604e23ff41eed684baf09bb6dc278393a55ca87d6e41e0986235cd3366d321dd85f
 DIST python-neutronclient-6.5.0.tar.gz 255893 BLAKE2B f7e6f6225e476c200b82bb4ca224b500078bd8357377a7d5d8a331531647ddce9df4bbc42e9d9cebee689d031bd47216c8fc9bce0ad2b3228890b8cbfd8979f8 SHA512 77d4f86f2bc066026c903c9c694dfe2de747dc7caec268853a3d2ae8e27a47b39695b33bd81b182334717fbab7817873ae468b928e85622204c348e5b18e0930
 DIST python-neutronclient-6.7.0.tar.gz 286482 BLAKE2B db64746641ce58cff379ea131f05c37e962cbb64323d4e76436f4b0b9169a954396b13530894e0c09c439072d7d040286f0face1e12ae537b417e7e14ddc600d SHA512 4201ce10173c91ade8b4699d54136e583da1cdd74ac340cad9f419c56d71e0cdcdb78a70795e69a8c5e13d2feba240315b976f32fd96f6561b696425f3c69885
 DIST python-neutronclient-6.9.0.tar.gz 284879 BLAKE2B 720d26489dae7e50617ec83c266ac1197dc1934a3b8f5e8a0e285227421cf8814d96d57ab30710b63eb92406663aafb29fe8d8d7efa1e1d2e74c116eaac5902c SHA512 89f5a2004c7888f11a1a17f4287ddf6942e083fc3871be4a8590a5bb86ec557584165a75cb6470ea3f19526eea882b0174746b20800211d11d10fea1210df74f
+EBUILD python-neutronclient-6.12.0.ebuild 3446 BLAKE2B 61feebf31f82dc0516719409951eb1830b72f8833bf2ec62f5d4416828133df7d209cecb7c3b29238b9cd7c010b4648e934bf0121e31cc6008aab358bfdd4822 SHA512 3604fdba30be159211adb64022cad183a01c5ed6cd4784b92aa269ce4359dcca28a3d97222f08c8b1812aa59eb3d8e4da44c61b61d85777ffc4627000de2c568
 EBUILD python-neutronclient-6.5.0.ebuild 3520 BLAKE2B ae0899bd61670e99895f2cf9be92808d08419fe2cf78264a46081540fed837013539de70087602a7e5446b67ec1a66a0dbc97a6f23d45cbf129f06b9762a0448 SHA512 16699805dda247b841832c04a72ac940405cf623bb40a5560f421e8495ddf70f7ea32da24c54d8b0b877528a55f6641aed4f8a7ddde670876888c211dcface95
 EBUILD python-neutronclient-6.7.0.ebuild 3360 BLAKE2B d2e4d5dffcbb4e7ef05c8cef4f4cc9799687cea690b93898c8d5e8f4b782f9d6d14121d16bb749aa5bd61f2ac02a527856a4aa507b97e5d126c851442462f6da SHA512 83c050febff542bb8cd7bf1a943d94c2b4e7837988ffcb1d531cdb1b2c81d8f204356125ba9d3879f6c46fcb503de1bc1e45f9176538b6603ff8835ff124b678
 EBUILD python-neutronclient-6.9.0.ebuild 3408 BLAKE2B 442daad58b5c3bbb771e2814749ea979a2f6d937f495289ab800eb2aa6963e68c118a7ac98d735f9f890ec5f883f89d383cb6ce41d4ca411885e252086da74a3 SHA512 706479e57c97694dd727358fff99831993e6edb600fc20f463664c739c2c1ad42ee0b3aa1c86b8b750a213ee68af49fff6e0078eee2ddf07cd2ee7cdb7e56241
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
new file mode 100644
index 000000000000..b4218847ff03
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^flake8-import-order/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 424be1d25b4c..2eeae621744a 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,7 +1,9 @@
 DIST python-novaclient-11.0.0.tar.gz 302163 BLAKE2B acc249b58e0bbdade3b7db7bdb6cd5be790a36cfb429aa72a22c44b4fae58d24411ea0d7fd2e0e7da3275e708dd34a22e9079ec9b5bbd08583ecd58f02071bd7 SHA512 6a7101dcb27674115817b724dbab877d875637503a69a2342c7a23f6f79f8065e9aec68806c8646feb0a83a704a11141a4af9f49a6596980b69a689b9d7fc74c
+DIST python-novaclient-13.0.0.tar.gz 312459 BLAKE2B c6be6e7f4f7ec554100adf7fa0ffdd07e6f2c6ecb19ecc289966dae39ec1466f972d56be6eba87270b38b382eb05f29fbd238341eeeaf3fee6d0cb8f5d1335b8 SHA512 91994e5f0ea5537d27cb0fbfe1c1412c9e3e423d8c0d0028a1011645722d2b1b30718fa7a502ffe154a3299e603ba9bb4aa51f1187b67c1cebce564203030981
 DIST python-novaclient-7.1.2.tar.gz 284152 BLAKE2B d632444db1393d69c9e87c2f487babe8931492c339e2838d4f024e01d78a2d1b2958feb0c9f22637311dbc5a6c51e052b241798a7507914f56ec10c3962ff27b SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516
 DIST python-novaclient-9.1.2.tar.gz 279803 BLAKE2B a26e80085200de4eb1da97a37feeb3da0a70fdfc4adcd837ce0e18a275ed819457e140aa94e74e7d07003d2607a245aa0a263bed954c7252f4f28092cc7b74c0 SHA512 d71008a32b022d452b43babef6b600f5ee2b2ad3a4e1a473731966f08132c5de813d9387982e4111c055d0266be6527cca3da5d58ec8b7bda8d628bb8189ca1b
 EBUILD python-novaclient-11.0.0.ebuild 2366 BLAKE2B 1b64f60e809a0f31e964fe2321ef85c55356ecc252abc1cf905aee2754617d23acb5bfdc069afa87a14a793396b979a7630f8a9860c49982c8d42bec987d3223 SHA512 3acb19cf67f14ae5a543dfdf4025de609fc6ad9f73d2385775c6f0b17923fed3681a6577b0bbd896a2d68390df6ae74a507c4e2f04eacb800879696c46bf6123
+EBUILD python-novaclient-13.0.0.ebuild 2363 BLAKE2B d58f871c853d04084ea47bbbdee53e0d1bb38d152777e5ae9d0532ad9e3822e41c86df9b1728176ca58708c3a0dc887c04df79c3d0aec174d7049f60d15c86b4 SHA512 192b655063ac1b60c5bf24f9fb6c5c438d233e70952416148d5fde57b464d69d43311405a7b55676e27ffe4d2b07ea2cdfd48ef0b7d36ff0d6c6c5729f4f5f7c
 EBUILD python-novaclient-7.1.2.ebuild 2403 BLAKE2B f64248509516a0c34b91736e9dff75f1fc723fa1edfa2e8242d46e715bb20307b6245c5c9ef234f33b45c00b354562b6108ed39052b282f6a3d2e15c280d393e SHA512 dd865239d2c2333151a0f0c7a89f48f2a91a2ce1b7539589741fbedf5cf49145e20f25c2a70ff5b6f7ee034af3a68a832f9aa792afb6a7123341cec7a7c60bf6
 EBUILD python-novaclient-9.1.2.ebuild 2572 BLAKE2B 91bf610bc46e221c431258f7ea7173f41d8bb8f439e3a4532fa6575376646c817c5a69ec2dbbc2ff94be4f244997a7dc712fc99b29b111abdac43e02139812b8 SHA512 3ac9eb0fd9df1cd57792e5f9b860337283278bd1c5da9591330cc2247eab278544d09e06e71568c4eed20c6e0670f335582b7a5284d273eaa2319c94e88106db
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
new file mode 100644
index 000000000000..35812f9ded95
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index a535bcaa9bd6..25fdef393712 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-openstackclient-3.14.3.tar.gz 670217 BLAKE2B 1b9b9f2a1ae4f4fda943cd0ead35de27446e6b6e616f196094f6a6870c657e0569ceea904ff31cef26d6af35186e5a8a5a64724156a0a82001543c34410fc7a2 SHA512 b3f81272fca1e47f241d95901081f711633ac984377e1ae8c5ff32b1fb256a1e409a404c92a8d933425ec98eb15594667556b3e97c4ba7398ea83becc5cff893
 DIST python-openstackclient-3.16.2.tar.gz 697555 BLAKE2B 11a911d8b11912d70c5e05df51b1d405c4e6a36b20378e89c8bda26dc7802d33fb4ca6b4e9a16b92bd6d0c33dc681b7540fc9af84742d42f69dd17d568558ceb SHA512 4966dc35e80c8b477629bd06c8f25c14ec32240669469c1b61b971654b0a62a43f5da7601343c40362b19f91c3c5a1e45b34c0c7c94da89e1503247d5dd80b56
+DIST python-openstackclient-3.18.0.tar.gz 719216 BLAKE2B 5895361b1d5a957a4d56d555e47c97519136002200e89dc3dfbf9966e4981a2803b3a63daa3b1905775101dede6de59c4cd82dfe36547587ba7b4c464fe58d4c SHA512 7afa430c9c623e1bb47b6a089307f9d4a788e08671a2e8539640733558ae023f5c5b1c8e34f3a01b1469f966e19d8680755757321bb93bb4c10a145fa5e0625c
 EBUILD python-openstackclient-3.14.3.ebuild 1291 BLAKE2B 62da6bdc39e256ea9dca8a71647e743c980cc8de49eb18e8332d887b0aed54362e24b85a644336e0ab49aad6d0d853706048066806228249043ec55e274823c4 SHA512 7ae7151d21bf88b8156bc0d403bbfd1d4d3a6f8778e6ab964475262b917fa347b666ef62e2d447762ce0a1cacb62f151112fb399d98e967626e4c6581b02db1f
 EBUILD python-openstackclient-3.16.2.ebuild 1293 BLAKE2B bec6392dc315f5d1868300f0841ac99b4d578610244eb1b5f58975e11ccf1e775e6c22744ef7084df430d6526f0a961314fda37033435f7099b863cb282f50b3 SHA512 9873eeeeb62b347cf6fbf807961f0ee020b5cacd3d66cf4a8f80d5fe1213d813fa490ec6beb8dc9c8d5f3e1ebeff2339b5737825a212a19efe9346b9ca235afc
+EBUILD python-openstackclient-3.18.0.ebuild 1298 BLAKE2B 88a9e809a9ed5950661effda269e58fd369254abffc4b380b23c811a36cf5dc90936cf9768e7fb593b31e78d30ed9fc84787cc9cdc3d4bc5e582c5677a669d33 SHA512 b64a4b3e3093afd0a97e7790853fa2ce7844f087e098bb44910597cff501c7ac8a507c6ffa34967d3f1639078889ab7794fd4eec6ef907c8b6bd1f1686fa64e2
 MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
new file mode 100644
index 000000000000..db6279fb353e
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.17.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-10.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index ca116b226dd4..0cb582c785ce 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -2,5 +2,5 @@ AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d80
 DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
 EBUILD pyudev-0.20.0-r1.ebuild 1498 BLAKE2B ec887ed44b71a5e44d3a80780cc9f2cec7492dcfa727b69f5476485bc15ebff9def00e75cd0628b74118340ec3d82cbb2a23fd28e8269f9485da5bead7c84a36 SHA512 31295a078dd2b54f54c53eb65e919641cdd5dabb5f031f02ef6f47829c074e59e79e7e24e1cb8b51991463fe372802adfeb6469e4c6e15e96b29068cbd0711c3
-EBUILD pyudev-0.21.0.ebuild 1488 BLAKE2B 4647dcb6052011d23ca5c1b92a9b8fa39c10d9ce0688c9b7bfd118af522020bb5b25993d2e525acd050a5d2c3d9197cb5a75292468054a8ec7502ee408ec5c97 SHA512 87058cb2f7a6e2190e5547fea313815312b20cbbf5ede339dfd6941396b94a79c0261cfff31319d083598990934d8bbf4d02438f2b0e62c1cf64c864f99f0fe6
+EBUILD pyudev-0.21.0.ebuild 1489 BLAKE2B 8c2386e4f72a3858a16a95b11054f169dc74da7e28a88b3c691312799c61c85140d1965384a6858f358900fd4a4b3886c7216ebac5dab016a8d0ba008b81a2a2 SHA512 becc65f7f1db64d3561a0a3bb3c7e4312d4d5a1efb0804fe141df7011506d139cdd8a31f4b5b2a98b85da6ca6f96724415034a70ef62950a3c7991078c18972f
 MISC metadata.xml 652 BLAKE2B 15c561bbbbf2c96a44e6d0ff39e7d1cbef709b52800051d09add19b88318e7d4c9ceb09c0942e7b01ed3b836df1348ce7c84b0deb8db4dc6e5bcebe200ebc95e SHA512 bf46b85c588d646d7cc6179a059d9fb8143eebce038e64af50f3129056a71b65a63a3cd214924ca538e6793f48912dd0f824a7826b49abbfbb8b27a72214c89b
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index 17e8665f3f09..d63e221d1ea7 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
new file mode 100644
index 000000000000..c4d1c1415f15
--- /dev/null
+++ b/dev-python/rq/Manifest
@@ -0,0 +1,3 @@
+DIST rq-0.13.0.tar.gz 45487 BLAKE2B 1985a097d419b50b19771a5f1c1526c8b8b3e9b960f7ecb2817cd731a9af0c37dd38e215a556d35ae8107cc93c3da9c023d4e73eda90e776d62a994d74f5bbda SHA512 f8cf5c3cf7360e0640a2ca97a42c85e67e59835317d04dc752008463224e073053c70ede17e179e1e8d287b3e4ed832971a0398636c49e2680f1183f0ebd2302
+EBUILD rq-0.13.0.ebuild 517 BLAKE2B 43e42a588fc0ce20d86e0b5feed41504288b6d4db77c8a27185a849d872658adc77d3af8fb207b210ef7e1d9895f075f28186ce52a534b4478df362caf445433 SHA512 8fc44fcd6cdea706be024d5975e004603b4ebab7345018bf959572cc8004fd4e58330c84e4a743f5bc45f3e6a3b319aa8bd53d1bfd4539285a2dd2d4187d02ae
+MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/rq/metadata.xml b/dev-python/rq/metadata.xml
new file mode 100644
index 000000000000..5d3d9dc0e2ac
--- /dev/null
+++ b/dev-python/rq/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>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/rq/rq-0.13.0.ebuild b/dev-python/rq/rq-0.13.0.ebuild
new file mode 100644
index 000000000000..e0b65c4fd2d5
--- /dev/null
+++ b/dev-python/rq/rq-0.13.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://github.com/rq/rq"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index df4518736544..98a7f75d4222 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,6 +1,6 @@
 AUX rsa-3.2.3-CVE-2016-1494.patch 3843 BLAKE2B 94721282f4079aa0a77813dd8ad1c0aefd0924272d4e2b3e8a6ad745375bafb6b6fe5e50af621232df632a1f2261be097fde92b5ad3f57b74ff7976c22daa9bc SHA512 9150b25bc1a9dacc8eee0fb93d46b9d024c868d540097b9166be9a7879fe116d8fd47cacaaf5614b86cd44e7cd10602a0ad290eb2ef116539683101d4057a231
 DIST rsa-3.2.3.tar.gz 35628 BLAKE2B fa30e8212d0102b7763a5e8eb408d0778520d85d9428e12b603fdfa5982c559682c04fec2eac4723a8c9e06c9ed77365021a832c8ad96b07fa07eb93c5a626e2 SHA512 52b33e0278e6e1fed64b1cdebed29f7caa31fae733c2d5875e6cba5a045aaa829616799d8de84fdb63c546780dbdafcabf1f85f25930b8e663861151479ef7e2
 DIST rsa-3.4.2.tar.gz 40956 BLAKE2B 9a6353c84329303c655e7a25fcfa2ca42ea846c913fac0c26fee4a27bb85f9380de876b2ec07ae2212eb37efe5d2e401b2672f187f74bbeee1e9ef1099629e36 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
-EBUILD rsa-3.2.3-r1.ebuild 777 BLAKE2B d776553eb2c3022a7f101b8cb5c6cf1f815020291f290ee12eaf41dbf7271e41dfebc1fcaa8aaaf5dc8b73f86ac5b670b534067ff70e1a2289a9b328727eb4f5 SHA512 816c7a69a4aa5f67de6835e308023d5b6a59a64e02bf3daaceb3bc8f060f70da009eb6d328325e77aec3ee6746ec27c89bd83a1089c64df8d2fb8fbbde0d40a5
-EBUILD rsa-3.4.2.ebuild 734 BLAKE2B 4eb74bed96bd4a9bc97db05b7ae711285f3637112fbaf5b5b6eaddec63165880dfcd14a284c6a847e7a6eeb3c9e732ce6d847f9a2ffd8ab4fcd57335bc23a307 SHA512 520e2e4cb4ac5500d556f71b0c35b6fbcc3cf61d8b62be9e4f65e0fb9aa30ea4ca435253b6f651d3d695b6c50c5d8bbdd6974fdca10a34190984199df94d4f84
+EBUILD rsa-3.2.3-r1.ebuild 776 BLAKE2B 0b91d65cc20a68b5f96bb3018b2ac5a38854166ec42b94ddf25e1c99561f357392d33c4b7918c452b6edc997b0d75ea8e67fb958a065b0fc6a2cdff084e5bf7c SHA512 f818211c6ea16bf2c43242f32b387e7b313afe5990dc7ea1fe6c9700778cd8266a60b8022b35a4212c8195ab44c762060525be79996ff3a666e935cb2cf79a09
+EBUILD rsa-3.4.2.ebuild 733 BLAKE2B 05db15f55e6470c93666583306ceb9ea621c04e17e099ca95af3df463ce9057ab266956f555e52b8ce313e33783f4556c05ada849f062dfeb1607959f6aefaf2 SHA512 6c313ac9b9fa218a04846a257af9a60182f51cf2c1753c19ecdc996364c34aa79ece26116e6dd03e0e403e4fe66a1129b863a90c7f351480137f0334e83680a3
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
index 01d4935db649..38c40d894329 100644
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/rsa/rsa-3.4.2.ebuild b/dev-python/rsa/rsa-3.4.2.ebuild
index 06b84e4231d8..0425fca85f25 100644
--- a/dev-python/rsa/rsa-3.4.2.ebuild
+++ b/dev-python/rsa/rsa-3.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index f9a97a429f8f..69603552f621 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -5,5 +5,5 @@ DIST rtslib-fb-2.1.69.tar.gz 69825 BLAKE2B d5bc7a526495922e9c00f81d11f5436b77a91
 EBUILD rtslib-fb-2.1.62.ebuild 616 BLAKE2B d6e4333fae6eb964572fca087152a46994a1b4d9f7b001dbea502b8f96716336adf3aa26e7899c57606270344aa1159fb7c6e27c4f59bad26d273280cfa017f3 SHA512 685ae458f4eda8dd89f652ae35230c3c1491852bb4b4d14a914de1957c320ed93f5dacd92f0320a1a0165938407776b8f9339e349a6a28b06dbe30961bf35fc4
 EBUILD rtslib-fb-2.1.66-r1.ebuild 626 BLAKE2B b50c46e295e63e3b6d8666bdf65bd82648dbc538c1ceb5849ddfe356716f668092ccfd048e91f07f06c915178851ae2a43537702e5e720a1b8767ec629c293ef SHA512 b307470c88becd0287d72eb074fb3135c86b43fbc9e87f2e5021a108cb2a39f37a6cf35918b6bb74e0d3a548e863d9f37f47bbc3c04e1d14135930e3d7b39626
 EBUILD rtslib-fb-2.1.66.ebuild 616 BLAKE2B e2697dbf353d972ec65d9a4dea042de06980235eeb1ae61becb67a0359fd2345c5b45bbdf680b0d66ccf244238da9083c45f8ba29f48137a16313fbc8964924d SHA512 bc244364b854c8e84d36456c4ab2c8fc94dcb3b135a0769d3df26f2dc6d7d0e227095c823bbe3f61174995e8a95266b03ecb5cfbb1bdd25e8c16c7527cfcaa7f
-EBUILD rtslib-fb-2.1.69.ebuild 690 BLAKE2B 4c961b1e680c54e55ea0ecd26bffe8a8900c926d241155f0804dfeeca9f8c93a0ca43ac845c1a90d5db76a300828c7ab3107174c9be1692229510e9993a16328 SHA512 170c2753491564be0004e8de5650a729a324c33aa1ddef528df28312983aae6021d9ba5c9b427346bd83b8b39007593f0139450367edf9364ef26a39043b00d1
+EBUILD rtslib-fb-2.1.69.ebuild 691 BLAKE2B ac1b1aac75ab4bd6c74ec2683235108780580758f404e43f88adb5b1ec8bde85c47aeab9ede10ba77fed62638b58fc6437c27f632f2be1db037fcecd7de699cc SHA512 7b386661cd6c04ac95f1deafdf6a6716800532de5712704f25de661c7d1813f2797f5fa626bfbee3045b34d5dde74329e504ae0b75cfb3ee62c880d94739093b
 MISC metadata.xml 827 BLAKE2B 488d8f9e2e3cdbf10224b0312e83fa23887952e960b6aa8ff95780acbbd9ef96175aa51bbd14e934af300903cecdcc50795c6078d210e833b5db9654bd5f217c SHA512 2082be66a05829bef801444b95306dbfe427e11f3f3f64049c1e96207f62603708c503bae6c92ababb371e640a2c0a071bd07bf37e69d341926d5654c6b8337f
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
index 20246ee07505..db34af0dd076 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1 systemd
 
 DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index ba89d001f2a3..30e0023d74bc 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,5 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
-EBUILD secretstorage-2.3.1.ebuild 688 BLAKE2B c3b9fb385b428b3c8552a888a0023f9ebcd694b34f560c8bc3f2936de5ea9a940b0e917896589a6059b55e2620929f08f726f9aa5801b93c2750c4fd5052732f SHA512 8e71eef0cc07a17f81b38c2d6e2f7b15541dfb5f5c5b4acbac7da6aaa7c1c36c5922600382ee248deba3020e9a65cf97071c937aafbf11e651bb339a1104bb11
+EBUILD secretstorage-2.3.1.ebuild 689 BLAKE2B 0fdeef8c9bec45ff0e6b8e1c9e7ee301ce393ed99a2013c3b6d249ff911250a0eec893cc6ebf2d5385d0e2ccca5ce8e713515ed3321f6bde234ffc46f6cdaac7 SHA512 0fe8d57d2e231eb236fb65c7d1c7d5d4ed927762355121356a1013015451d18ce5c6a162857f1d67ac6adddfb2656140e01647d5ae726d22066efaffe77b54ba
 EBUILD secretstorage-3.1.0.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
index 82a0f03b90cf..1204728b2cd6 100644
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index b18553e75dc3..04571ee51136 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,3 +1,3 @@
 DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
-EBUILD tooz-1.60.1.ebuild 1266 BLAKE2B fd9b94ff97e4c98b94f23dac3435b5ecd92ede49f1ecc4d4abef4495610bf088ccbb4a2ca68913a3d11834085607734996a62c28de5ec0fd1017d447146853f5 SHA512 b8cc7e32f266a6037fd260f106aa185ed6bc38278088c329f7f187c89bd325605f358997867a9566d47e6072f9f0b19bf10ac9fac9f1e113dee02478dc4b77a3
+EBUILD tooz-1.60.1.ebuild 1267 BLAKE2B bceea7ae6757e0892699a436f8cc8bce584c4d87c6292d2bbf58df86eb025f51785b93615f3b851a3a81cfe4b07e1ac5509eb9e11bf678ee003ab8dcdea49291 SHA512 9b45bc9edd7afb28a86e219ba1c02c510a0dc9ca299e6e42246a951b54d269380653be308e752610f23bcbdb25137beb1f29c97100361677dc8598dec8404783
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
index 3275d7b61774..59b1d4767e1e 100644
--- a/dev-python/tooz/tooz-1.60.1.ebuild
+++ b/dev-python/tooz/tooz-1.60.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index ed5d22217000..e0eb4830edce 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,5 +1,5 @@
 DIST uritemplate-0.6.tar.gz 3508 BLAKE2B 41abd9a347a6ab0fae668a63c185d64e857cb88431a3b8ecaa673076a1fb700869c1679313ed772c2aade5952cbad7f0ce898f4be4ea280fe8d867cf1c280911 SHA512 19e9d2f7cb6275c1a3bc6e287d9d3bdbed4391541f29765130a8e33825321e33fe3220adc349794d179354bcb9d77571ae20ba7836034962f3713994c7cdbfbd
 DIST uritemplate-3.0.0.tar.gz 30038 BLAKE2B eac4deaa980a9a4618a245bfdc8b3df2180a4285b9197488e7556e3cbce88c4a52ee8bdfecc5f500d80d14a59f8ff0e1ecbcb3aedff422fa9853cb2d40e25df4 SHA512 9988ae6db1d0234a2dfb393ab0205dd7902c814b8a85e06a666b8fec44cacec90fc8852b64da068242cb57cbb2ed63478567224fcb6751df82605d1f0881ad6e
 EBUILD uritemplate-0.6.ebuild 561 BLAKE2B ad7764652c3f248e661b69b26bb93849578cc3624e203b1a2c3232af96bcfbb3d43c23264ea1b113ccb0d4c2baff817ac53712983920fa427913fb9937907fcd SHA512 bf76684f7d2863a326a86382063d4487f4b67050cacf044514aa319661967519e56ef0219448e3bb68743fe911b821d22c6bbbbbca2159f35b07ad3fcf95af04
-EBUILD uritemplate-3.0.0.ebuild 568 BLAKE2B 0489b5881fc6336f2fe383267eae6c6c36878facd4e7914bc6fde62cd54b5e7f4c796ed8b82edb3925d647641b2b370f29e986ff274e3d548a407b6729b734ee SHA512 3c848f8539beefa1f6c2a3a5c3e6cd3aa439fc7a86cc553de31e15c88d75e2e9913929fabe231a6db353609960347e47b08d8d7e1e2954cab62e1c7f802953f0
+EBUILD uritemplate-3.0.0.ebuild 567 BLAKE2B 779d96b8197e0a4232f66b7fc50fbe78be59e773609d1f148bb323a66556326a79a32b276b438bf0b2f933fe31da588d439f4fa46e3799d8407fe5317cdd0fb7 SHA512 ff65bd151897a10caa116d0c5d8230d27a63844d58f31e3d56f033bb707aa884488d5d3182679758678f4cb17a2fa22bd8b150c5d67f52ad8bd7bde34d114aac
 MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
index 52c980c86e9e..70ae58a7e62d 100644
--- a/dev-python/uritemplate/uritemplate-3.0.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
index 77797b0c6def..ac12330a2fc7 100644
--- a/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
+++ b/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/GeoRuby/Manifest b/dev-ruby/GeoRuby/Manifest
index c08c83cce448..e793e3b90129 100644
--- a/dev-ruby/GeoRuby/Manifest
+++ b/dev-ruby/GeoRuby/Manifest
@@ -1,3 +1,3 @@
 DIST georuby-2.5.2.gem 211456 BLAKE2B 67340729118cfb64d78a0ac3e98a6e29414ba0ca111c8a9e608486803c4c1da51e99e06b9ac1abfba0b3781d330ad83e09b72cb5d643d32fc47ce35307045a17 SHA512 f65aca747ff2615ce2cecf0d3a9fa8728b362f211da0433b075e5abd95644daa8d5d8a6e19b051b8e2b78d55e819f07b19b2dfcb95f26f3d678c698fd7126f3f
-EBUILD GeoRuby-2.5.2.ebuild 640 BLAKE2B 28c57de526deb535aec38995493a687cb98c0c2022bb9b9f5af6579b53e1bf4441c1253b95faed101109397f20ea439c51d5f05252fda9da239e57ee2c9f8015 SHA512 53a64bbef3169c50ddb953abc006f6d408fcbdb852594dd39b6e1686d89f8fb4b5b5fd5f3da8a5a13bf497d48403f08fba416aca682cb2d0f1b5f022fb723d16
+EBUILD GeoRuby-2.5.2.ebuild 637 BLAKE2B ad89f0202a6a8c3ca6a0df88a00d8d0c42bef3b7b2159b88b38cc16b2962bf74e18c3c003deb3418332a3678b80ae4d4d8dc0a5cfa3103f42f7dd23d8f0603c3 SHA512 bbfea0e80e23b8f03a73d69545fb143d626b0c4e4c5ec7046dec38e489c5c9333c409e94c4301ae024f14d1af8744203660342e06bd239b8a94f44b4bb476f1e
 MISC metadata.xml 475 BLAKE2B 61cd7a83f8ed2294338504f60c03e01e7144d58825db4732c207531fc78b34929bec9fc5459c4ab1458a0fc95ab97e07d1abe09b7eb5a54f867b214d9fbcc24d SHA512 d77d215e43f829b563daf62e06a06864e6e691784867227e6fc24726f5b6ba5238e356971c24bb1d1ccb5555fa65342da6530c9111a304552111a4deddc46111
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 90af413c67fb..7ac14455519a 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index c0bdbe2a0219..560ba25644a6 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,7 +1,5 @@
 DIST activeldap-4.0.6.gem 225280 BLAKE2B 0f03ef95f3d0600d2661eab048c8dda3fbabe519add67f7785895e346d835d1e0396270f829f16a982f12863c80378be2f4f7ff7cf84016007b005b1914cec15 SHA512 03053e3798b557c73c3a0918b72d1d3c2cada4da3475913ef17a6f9f2f1ac1e102052459ef1a6d8c25ce41382b64c1a3097ccba1c768497a33a3a971b9778d3b
-DIST activeldap-5.2.2.gem 225280 BLAKE2B a31f77f1e93e5130f6d1a026ea804fca192273ac66c7f04218a5465c79f25934d7a289bcd66e5e7910ef679f9e043f4c22c14607b2f44bc93039e90f3082e798 SHA512 303f26289848b0580a827aa3ea8446ff38dc0604eac7d976f48c7c751c7fe31f918af17a5d530943711dfbf2808e9712ab71ff5cc8c657f78ba60d1c6e3d6072
 DIST activeldap-5.2.3.gem 226304 BLAKE2B 5ac747f9c854071da941bd7dc3bbf151eb9f6b190a725b0daca9a9c76b1aafa9fcb609c16098924c3f9bda6f25d9968c4a715a0f2994333c233a950f809cf862 SHA512 30fb4b70975e5a911d736ce8579f3ff0c13d326499660a6fdd25bc4e4d20ad615c038c0b50bdf1722775f6313e9c132a004c86fdb9d3a356f78171f78c5d171b
 EBUILD activeldap-4.0.6.ebuild 856 BLAKE2B 44419f128f93e1ee06e4b4012c0c041e67dbaf2c38af7d65f4c5b8f978ec7f8caa15c5bf36e2f01cd23e621004d51cb3169737450741ff91f16cb737ea8f59d9 SHA512 da750eb877564477f4c5d1d7a4b3ab4359339b74d6d5113b5964a43de35a0dbc5be8057945befc8ae590799add88e8b1019df3d073c5055033656bfd1fc6e5d1
-EBUILD activeldap-5.2.2.ebuild 874 BLAKE2B 155daf0464a5064b961fd06ccbbd096b7963ba64f521dcff5281df19432650212206644f08cda012cdac4e65770ba6a13e2ab9b4573da1654b7d227553de1f2d SHA512 ebbe2d7e4b33ce14be0f7e9f13be5186aed0f865d7b10c19195cbe67333efba62fa1628358a1145b9df513478af5333c46817fde38ea4f8977952afdde04df99
 EBUILD activeldap-5.2.3.ebuild 871 BLAKE2B 1784d14bb7f11b0d7b13f7e577e55899c90a353e1851b9a6caaefa59fafc0480cbbaa330ea9fa2dd3b11da5fc80da04128d2e3e96996a5d65857ac5f0968913b SHA512 56558db1edcafdc204ba91481c3ef953eac9aa7d5d7730cf7fd3cd571f6cae6e2a9f9f868b5a6ee37ed90e8314f78531282af4156eeeda3dffb86a37048e5739
 MISC metadata.xml 347 BLAKE2B 14d83abbee66dd0fac29431f2e219444dc61b0a27861dfb3eae63a245fec285627ec788f4da897dadf81f3cf2d94406121c565a3c29121400498d1f96ba7fe17 SHA512 642b21533d2c7665de55d54190762be8b6c295060ad0d20ce2a65b81d86cdd3156571470189acdc142b4f54d7b7eb60e4e7e2be8d3534f220c299f8cf3c1f555
diff --git a/dev-ruby/activeldap/activeldap-5.2.2.ebuild b/dev-ruby/activeldap/activeldap-5.2.2.ebuild
deleted file mode 100644
index 6f2251813e69..000000000000
--- a/dev-ruby/activeldap/activeldap-5.2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.textile TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>dev-ruby/activemodel-4.0.0:*
-	dev-ruby/builder
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-ruby/archive-tar-minitar/Manifest b/dev-ruby/archive-tar-minitar/Manifest
index 6fc6ff431c18..bc1b7aad10b6 100644
--- a/dev-ruby/archive-tar-minitar/Manifest
+++ b/dev-ruby/archive-tar-minitar/Manifest
@@ -1,9 +1,5 @@
-DIST archive-tar-minitar-0.6.1.tar.gz 29972 BLAKE2B 8881480aeb6fa8ea52dea22d6dd8fd51180c5224220b52336f54c7e68a0ed53709c28f671221c2e02141cf2918f862509815d649c9fc1def9d0f0c030c1064f1 SHA512 67b4636fc8d1651b90621a5e836b6e2912109dd90ec03ac86c9856abe544f55276c6aa520640b8a25e7f74c2619b77798aacfe1e10795da20f9fa78b7c3d5a07
-DIST archive-tar-minitar-0.7.tar.gz 31722 BLAKE2B 2cbf24f28558e3c253f963f049644f3924ad46e5227f9a85d786e682fe10693639a5768562774de981678c90d776227fb6833e863389a2d1c1a7ebc467cc3235 SHA512 754c66c4730f5205afced8b53dd83b9426c9a854e7607eb2f9395523bf45780b60428ce77bc09d102c45bef980ef97605de94c0b75611cd9bd32167f929e2003
 DIST archive-tar-minitar-0.8.tar.gz 33632 BLAKE2B b576c74cfd59893d4c0c935703453551f9a0ca6258bc6a2b1ecb3151a44ff166607931e554c811fffb489b6398123cd9e8e58372a94b303df45d88ef903868ad SHA512 cab4798b98d91a17dd5ce4aed3f6fd166dab61e8c9e3bef3df218944fe1657a9ec9d40a52ab2773430070e50410c401da799469b096dcc2b22d6466da1e50b8d
 DIST minitar-0.6.1.gem 29184 BLAKE2B ff6ff432a669e1244d785ef26bd56ea0631573c0efd84fd64b51758815362fcb001f11dd21486d155b366bafc05d8f30f24ef3ac7bb205d9a03568128a354333 SHA512 e8a4acd8c831ef587d9571376ae111454faba1d6d4db5c88f2087c84d3dbb5487cdcac8ad47c5f717e195262b95040a9ee72cdaeaad23715b8a1270baec6ec70
-EBUILD archive-tar-minitar-0.6.1-r1.ebuild 876 BLAKE2B d1b0801611a84142d9fc8a908a9dd0a1e173c41d6f1aff8e38c7e81eb334a66cba393fbe18094fa21e1f9d8e8e438a04251e25959fe4d66cfc04762371475487 SHA512 7bd448e47ab6f5a9374a94b2248def43c806a1b69d4512c4da274c517d9d96de48e49f7a9c7b5d850002450d0d9b815df4b1b6a382b90c6c6b909b6508f0bbd3
 EBUILD archive-tar-minitar-0.6.1.ebuild 867 BLAKE2B c37e78186e3d02653671772ab399cfa025a376b1efcbd0267c075eb3d8743cb8182c02a4a417ae1b3f03751f8969e0959a51d9f56e7d8a096498d1aa1019951c SHA512 060d20fa3f3a6b541781cbcffce5fef9dbb21e44a18faf33051cfa07a5a9735d2f5233dcd0900ec60847062c30992e92208b974af7d6d328ba07c0cf2fb7e77c
-EBUILD archive-tar-minitar-0.7.ebuild 866 BLAKE2B d0b4c12a477dbbbea4fb7648a6dda6f10ee9493ad58399e08d99c9836832e4a40c78458beac00defc5fd44641ce66af41c4c05f3dfe003d2131af7c86a420cf1 SHA512 9e944df12a37ec71beee207c58a641ec522122a94677261be5b8594ddc7c97465d179a7f916c78b0788c42121c0b1362cef4ea95bcf9ea96727c281866129280
 EBUILD archive-tar-minitar-0.8.ebuild 873 BLAKE2B 65b320695d729dc602c5d96b98f7d981cecc9cdcf61b99797b37f49fc25b858f5cbb08add27f5550d9713325ecd29bc4ffbb05781c0b463887f83d6562255d90 SHA512 fa05e0b4d174873069725b7c1fbf59ccb7015a4c4c3c46913357635bcfe6e487db9da37723182c1c7d062bbb3bc1ea803659f495bb77faa34b180fa49b61c3ba
 MISC metadata.xml 344 BLAKE2B 859b7af9a7a2a07b43cc2625a5ac93a91aa9f16041a1f179654e126ab4f78d347a7816098bb6cc559fc1bc004f27156a06a83581ffdf143d86c15d8fa2a3fbc8 SHA512 fe6d4710ed497c7b81b336533868f760892f8946f766a2749349ffc105e33309abcfd7473bc940ef0cd0cada97965d4cc9504b53a76b9cb9b846c64244e2896c
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1-r1.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1-r1.ebuild
deleted file mode 100644
index 1f5565d61f23..000000000000
--- a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
-
-RUBY_FAKEGEM_GEMNAME=minitar
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
-HOMEPAGE="https://github.com/halostatue/minitar"
-SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minitar-${PV}"
-
-LICENSE="|| ( BSD-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.7.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.7.ebuild
deleted file mode 100644
index 74d0cb118968..000000000000
--- a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
-
-RUBY_FAKEGEM_GEMNAME=minitar
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
-HOMEPAGE="https://github.com/halostatue/minitar"
-SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minitar-${PV}"
-
-LICENSE="|| ( BSD-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest
index b8da47ccf898..22219be25c10 100644
--- a/dev-ruby/aws-sdk-core/Manifest
+++ b/dev-ruby/aws-sdk-core/Manifest
@@ -1,7 +1,3 @@
-DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30bb6b9565e304549aa44008a5f26368b6d143bc3e448e5b24e38a7d1e0cadbed728e961f4df3c808ce52bf941a7e3e74f0fc SHA512 39e7abb9e549803a27422a1765b84cf0e4d08a93632a6646eb1b39d67e11329ca78b4de739f8fac98291014ca408a73bf1659d9e9021c94c1494612e2c5e3679
-DIST aws-sdk-ruby-2.10.134.tar.gz 3673818 BLAKE2B ae99578cfb4b0723213b24070f3b06f05407c74930c09be4b331ce3981dab36d8dd449e79d3dca777f4fe57fffe962739becb34bedda4090937e2468734d32fb SHA512 403e4a00a3fb6e39f3a0641dc2c26cbbccc841c7ed49a261747edf1f1a0223e7809b460c5e08f8e22972fbd3f7ae160be4447e633692f555ad2999cf5304b170
 DIST aws-sdk-ruby-2.11.79.tar.gz 4068576 BLAKE2B 481852772704dd91afca4511f402e0288aa80523133be2d15f0a3d085efca7c38fce1e7d794ebc9ffca5c4b2b5f69c9366346525f250ab9c2b06aa6c7e9631ee SHA512 dc9076f3658e6d764671a2f661c9c5363977807861bb9a71d287ebb55de02fc80679a209ea00d438d162f4185cf2f8c65800fde8712f143b17c5b60369f7203e
-EBUILD aws-sdk-core-2.10.100.ebuild 1099 BLAKE2B 8af09b83e62206d65195ea4d5d8f39a8e400f3284bcd8614a29a61167dbb4797479eb0ad33302a01819cee32a4b90e56744a69fe8e57c09d07c2be7132600dfb SHA512 7e898f070707f5c9336d66e67226133995be884737422a6d0105fa97201f13bb03f63e52141d72aa903671d34d79a88ab3458d577c2ef4c8ef1a8c04faaee5da
-EBUILD aws-sdk-core-2.10.134.ebuild 1099 BLAKE2B 2185acc2c0e5813700e4bc4732932355b603bdb1b046100510ec9a9d054461bac9d3c54f466f377309be9fe80d0ee7a0616c3163e070eae1a0568376ed595ed7 SHA512 243f4f0086a09dcfff372a51d9e37fe6336c57ee7a609f9504f00273a8770d2c5dcb4cc0f0f46a28e341fc676deddaf7254a283e34ce1a8a1f29ac04609669ab
 EBUILD aws-sdk-core-2.11.79.ebuild 1099 BLAKE2B 2c019bdb62ef7adda1bc253cfc603e23967fedc164cf81a6edddb9a2d89ad1ae48c9f160c070de89ca25f8140194b8565bc4650e04544ea4e2dd2646a4005ce5 SHA512 1c3f6e7f9857dac3b47cb98b4fca4b54ff1f5b54de46596e3d0fb1b80b687e4bb0ed6963640628bca953ce15dacb2afd0a0267cfed0bfd42e80005f8c91432b2
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
deleted file mode 100644
index 3c1115f5dbcf..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that gets confused by our directory names
-	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
-		spec/seahorse/client/plugin_list_spec.rb || die
-}
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.134.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.134.ebuild
deleted file mode 100644
index 112da8ffee42..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.134.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that gets confused by our directory names
-	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
-		spec/seahorse/client/plugin_list_spec.rb || die
-}
diff --git a/dev-ruby/aws-sdk-resources/Manifest b/dev-ruby/aws-sdk-resources/Manifest
index c620a8be4b33..b46fad2cdfdc 100644
--- a/dev-ruby/aws-sdk-resources/Manifest
+++ b/dev-ruby/aws-sdk-resources/Manifest
@@ -1,7 +1,3 @@
-DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30bb6b9565e304549aa44008a5f26368b6d143bc3e448e5b24e38a7d1e0cadbed728e961f4df3c808ce52bf941a7e3e74f0fc SHA512 39e7abb9e549803a27422a1765b84cf0e4d08a93632a6646eb1b39d67e11329ca78b4de739f8fac98291014ca408a73bf1659d9e9021c94c1494612e2c5e3679
-DIST aws-sdk-ruby-2.10.134.tar.gz 3673818 BLAKE2B ae99578cfb4b0723213b24070f3b06f05407c74930c09be4b331ce3981dab36d8dd449e79d3dca777f4fe57fffe962739becb34bedda4090937e2468734d32fb SHA512 403e4a00a3fb6e39f3a0641dc2c26cbbccc841c7ed49a261747edf1f1a0223e7809b460c5e08f8e22972fbd3f7ae160be4447e633692f555ad2999cf5304b170
 DIST aws-sdk-ruby-2.11.79.tar.gz 4068576 BLAKE2B 481852772704dd91afca4511f402e0288aa80523133be2d15f0a3d085efca7c38fce1e7d794ebc9ffca5c4b2b5f69c9366346525f250ab9c2b06aa6c7e9631ee SHA512 dc9076f3658e6d764671a2f661c9c5363977807861bb9a71d287ebb55de02fc80679a209ea00d438d162f4185cf2f8c65800fde8712f143b17c5b60369f7203e
-EBUILD aws-sdk-resources-2.10.100.ebuild 881 BLAKE2B f896bc1ffcfa1d0a917403c4b23ee6763f68690be2062b24c18fd285cfc457a4b8c46ec0eee3c9fdbf3ad1369ee7c93868bcf1193a1d88a5eac82167cc16ed12 SHA512 e45b938ca519bbe9e2d25f4b58c75d250c328f86336cb7659679057cc7aecec378d01c5d5fea2f3a974c711cab6d213f3a9936099af521428c554864cbc585c4
-EBUILD aws-sdk-resources-2.10.134.ebuild 881 BLAKE2B 30585530cee75c31690126c548c9052c7774af5603ca4765c2643870275cbbcdf1a3cfe90f4e3bf54c13773f3e9525da045a6b252a97d90c7a53a13447be0288 SHA512 04f8041d37cefe108ce0a0782178216fef143c6095a45a60a10cb050f774eb090bf6b85fb70e2ce1b84703ea97452df70598e150b5f3d7e34b1c3d30d8c2374d
 EBUILD aws-sdk-resources-2.11.79.ebuild 881 BLAKE2B 6edc53d3cb5c6b9bf461990d418393550bbc26ce947b77fcbb25c22c2692bb747e274a5b035e5571617333b12c59988f38c63c15669a044bf85dc3c85a3c2953 SHA512 13d0425b4885301df69fe3efc8ee5c025854f5d454b819f525f0010bf017a054b335fccf8ac047f7cfaf629146b013a869ce9aea62a31e1363d875485a92b168
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild
deleted file mode 100644
index 7b7648c32af8..000000000000
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
-
-ruby_add_bdepend "dev-ruby/webmock"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.134.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.134.ebuild
deleted file mode 100644
index 05f044292654..000000000000
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.134.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
-
-ruby_add_bdepend "dev-ruby/webmock"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index df8660072896..7a01cc82b6c7 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -1,7 +1,3 @@
-DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30bb6b9565e304549aa44008a5f26368b6d143bc3e448e5b24e38a7d1e0cadbed728e961f4df3c808ce52bf941a7e3e74f0fc SHA512 39e7abb9e549803a27422a1765b84cf0e4d08a93632a6646eb1b39d67e11329ca78b4de739f8fac98291014ca408a73bf1659d9e9021c94c1494612e2c5e3679
-DIST aws-sdk-ruby-2.10.134.tar.gz 3673818 BLAKE2B ae99578cfb4b0723213b24070f3b06f05407c74930c09be4b331ce3981dab36d8dd449e79d3dca777f4fe57fffe962739becb34bedda4090937e2468734d32fb SHA512 403e4a00a3fb6e39f3a0641dc2c26cbbccc841c7ed49a261747edf1f1a0223e7809b460c5e08f8e22972fbd3f7ae160be4447e633692f555ad2999cf5304b170
 DIST aws-sdk-ruby-2.11.79.tar.gz 4068576 BLAKE2B 481852772704dd91afca4511f402e0288aa80523133be2d15f0a3d085efca7c38fce1e7d794ebc9ffca5c4b2b5f69c9366346525f250ab9c2b06aa6c7e9631ee SHA512 dc9076f3658e6d764671a2f661c9c5363977807861bb9a71d287ebb55de02fc80679a209ea00d438d162f4185cf2f8c65800fde8712f143b17c5b60369f7203e
-EBUILD aws-sdk-2.10.100.ebuild 809 BLAKE2B 60297108fb3fc665b7b1d760f52a66c492974dbc8b68e6e2fed421e5bd14306672a06b57eeb4a040accb1f86dad9410d8dec57483cccf3a77c1ba46be07bca13 SHA512 813ddb148b63476561c1dfcfe8b8be1c76c541bb877468a9884dda80f6b4500862e04b1aa819c476c72c045008289030ee78e7f941d777e2c76c5c8f75559d33
-EBUILD aws-sdk-2.10.134.ebuild 809 BLAKE2B bd5565ddc2383a5d89c6cd93b646a965effe01166a1ec95ec0552aa6cd0b7de4faaee3d3a0bc88277f8e1628c4f5f083fec890c102ff311332cb14a31b61969b SHA512 b06d7224f9dda81b3b8be55592bcf30b8556252313b14aee1583055b69ec0abd2e15ca72353d79c38bcdfe2bd1a6cafc01c7716d73ba19666c5e4ec9eac575db
 EBUILD aws-sdk-2.11.79.ebuild 809 BLAKE2B a809ad1db419a20fecd2fefe0090aeb0875d399375ceaaee6dec9f020a1c9e0bd5e88d23f0d3c19c11e15313dd5a84f47f728ea0cf4b0f328023d71359fabda7 SHA512 fdb75fef9c84fbd3557288a2191dc29dac571f9f34257f9cac9052a831f1955322d932cc3d341c6f42ade49edf70a3c3b16e05c30fa2009b83a9b51c037b274e
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild
deleted file mode 100644
index 50ea2b16606d..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.10.134.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.10.134.ebuild
deleted file mode 100644
index cc6e13ba282f..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-2.10.134.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index 9e0db240d061..34784940283d 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,5 +1,3 @@
-DIST aws-sigv4-1.0.2.gem 10752 BLAKE2B f491683c1ffea0d528b90d5876b0417a154ed8288e4410d11dd46253979afc908f1da0f3859073291aa0161f4600fddcefef9368e325a1d8e6d62aa4b0d015a1 SHA512 df09ba9ca7f78bfd2e0308454dc2ba701409f857474d28f0efe9ed3fc5f516fb1134dc0c8f7000ba506eb4128d7ebd501eb1937dac910538ae63f3cdca7f3984
 DIST aws-sigv4-1.0.3.gem 10752 BLAKE2B 6e9f8d106a8a61bc4982d8653e550f9c795ec9fcac6e4521d318bab9a9ee74036eed8ef7c7c4f192dbbc92ac7ed7011f1c764d0b87df1f72404ab4bd2f357347 SHA512 a3d8cfbfe54196ed43c4ed6f7dfb7234808c540aee6324ab6752b1c8356890a8e697d128f7c6a3257030e8d5df1bb5bb36fae67c575e2648da89232586a3f82b
-EBUILD aws-sigv4-1.0.2.ebuild 410 BLAKE2B 9e111c37c31f88946ae9058aa0c74f72a5d5789ab1080af90f94528305749ba01dd38f2a4127645ec1e227d7922c3f8883d9ffebbf03b8ee9eb95c34d14f3b80 SHA512 9374259b29303e5ae2c601c904bf41b9230cca65c0555c426073dd1e9a5cefa7fbf6b34e9725c18a7b6db5e681ad857ffdf5028e4be1344b4c49a8d7c51a4f08
 EBUILD aws-sigv4-1.0.3.ebuild 414 BLAKE2B a60b90938aa4338e1b2626683638492903e7f685576f92f0fc9f2b4eaf16511388b21825cc6461693a148b9723148ad1f7a6b4f8d778693b42cd25b664a8d71b SHA512 a90343c9c9340d76bfd39e5f66ea000771fc6d300d5369483500ab04d8fad29afd1670020a1806a9c379fc36432fdda33850957533aa12b134bcc252efae9ff8
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.0.2.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.0.2.ebuild
deleted file mode 100644
index 29b4bc1779a5..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index 21ad8c355a94..08019b391711 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1,5 +1,3 @@
-DIST barby-0.6.5.tar.gz 93781 BLAKE2B 52589bd473403e6640426eeda6c5f4f9e0b070693e2a146fc077bba33e141fd73bc0ff73908f61d0efb6b8d1c5cd971527f9ae75333ecf029d44ea21135c2133 SHA512 f6101edf7a75986c55577d27dcbb0628fc7a6a4d2b8b4eab7a53e2703fbd0a1ec70a062c7a1e3d2b65db2afeecf8f0375a936c2932125b0d96647b8d24dd0e5c
 DIST barby-0.6.6.tar.gz 95120 BLAKE2B e46f261eb11eb2f5b17061e6cbe04419df81d4248a9bed8a5f8f90cba9329915cacf3fa48cc922f4eac14ca7eada87e5be526d9b0d2e0bd1f443daf09af89088 SHA512 5b0a00861b9cecee153c5e1f4e1564d99021b3f7f6005efc48d666f8b4255e91f18792d19b9ae635d40f72dbb38de8db215a252b553138be737a52a8ba85c728
-EBUILD barby-0.6.5.ebuild 2405 BLAKE2B d3f278e67548cc8cca3d0b27da5ea879e996e1ab1e45b01b77efcbd4e1d449e93c01cedc724f203e5dbbd46a3ef236df199e4da958e4a6f9832182663e51dad0 SHA512 a89867db71a7ffb645952dda91dab8313c8b278911df9e5637770de3f428e68e5d842993191795a5de9d939d48695869916b1e09adeea7ac5097ef496c6cce16
 EBUILD barby-0.6.6.ebuild 2402 BLAKE2B b0a2f7b6ab787f3fe84879eb4e6d5df34b12fbe11c34bcb492d21d91f996e7104a209d62a2ddb16f14485dda3146b77c8f76e5a2c565e9a5f3f970c5ee453c8f SHA512 b2d94ed9fe4d4b0ca2446837a1387b304e7410a5ac8acab634663e971893c577df667328805a6b43b16adfe135e794c260d1307fda49e586c4f3c92e215409a8
 MISC metadata.xml 1073 BLAKE2B bf39d76c0240bbdeeb85299879247c695237c4a614c1728ef2c432b8049a9e1bf381acdfeafb0bc3083c2238d3b4489790c845d127fafa14038538fa0ef01b8f SHA512 c3e13b0b201a8a8556b5f725d366b78da9ee82bae9707a8722055d0e5e73571560209657e4c7ef69a777934585cdd2d0e001a979f35773f9f31ac99d6346f4dd
diff --git a/dev-ruby/barby/barby-0.6.5.ebuild b/dev-ruby/barby/barby-0.6.5.ebuild
deleted file mode 100644
index 619911e8ac6e..000000000000
--- a/dev-ruby/barby/barby-0.6.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
-HOMEPAGE="http://toreto.re/barby/"
-
-GITHUB_USER="toretore"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test qrcode rmagick prawn png cairo"
-
-ruby_add_rdepend "
-	rmagick? ( dev-ruby/rmagick )
-	cairo? ( dev-ruby/rcairo )"
-
-ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
-	png? ( dev-ruby/chunky_png )
-	prawn? ( dev-ruby/prawn:* )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-# testing requires imagemagick capable of png output
-DEPEND+=" test? ( media-gfx/imagemagick[png] )"
-
-# prawn breaks tests for some reasons, needs to be investigated; code
-# still works though.
-RESTRICT="prawn? ( test )"
-
-all_ruby_prepare() {
-	sed -i -e 's/README/README.md/' Rakefile || die
-
-	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
-
-	if use qrcode; then
-		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/barcode/qr_code.rb \
-			test/qr_code_test.rb
-	fi
-
-	if use rmagick; then
-		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/rmagick_outputter.rb \
-			test/outputter/rmagick_outputter_test.rb
-	fi
-
-	if use prawn; then
-		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/prawn_outputter.rb \
-			test/outputter/prawn_outputter_test.rb
-	fi
-
-	if use png; then
-		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/png_outputter.rb \
-			test/outputter/png_outputter_test.rb
-	fi
-
-	if use cairo; then
-		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/cairo_outputter.rb \
-			test/outputter/cairo_outputter_test.rb
-	fi
-
-	rm -f \
-		lib/barby/barcode/data_matrix.rb \
-		test/data_matrix_test.rb \
-		lib/barby/outputter/pdfwriter_outputter.rb \
-		test/outputter/pdfwriter_outputter_test.rb || die
-
-	sed -i \
-		-e '/semacode/d' \
-		-e '/pdf-writer/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/bindata/Manifest b/dev-ruby/bindata/Manifest
index ebe4e43af88d..d1019d245dee 100644
--- a/dev-ruby/bindata/Manifest
+++ b/dev-ruby/bindata/Manifest
@@ -1,5 +1,3 @@
-DIST bindata-2.4.0.gem 78848 BLAKE2B a4c602a2557293449ba0e5b36e300ba6e108db7364cd08e76b8c1db65a51e74c4d1a522b075a09684ba543fc8c57a3f9ac427a23b273cbd689962488d97acf48 SHA512 3c6d4391e2b4c684d00b63addd544e3ddbfcbfd5cc9de42e4b45f7d655a0231902dfc960ef342a9935b39f12dc15adeb861b1a001105203f066e0efd9d6997f3
 DIST bindata-2.4.1.gem 78848 BLAKE2B a497299aca02abe61c64fe946ef928ade75f58195bdafa1b5ac842c7dd272e0dd2e5da957b558492bb1dd1e47da7da1525c0d54f0e97e571c5db804e8b24ef7e SHA512 5bbbb38f7deb461c234801677baf30bf6d5300dd46f201ebcaef4cc4182354e1ed375fc1c341a13d6b3a1f579e25e4e53d8aeab0dd979a581131e2a984758243
-EBUILD bindata-2.4.0.ebuild 536 BLAKE2B bdf37913877910d6b28b126c7ddecee67ce255fa9d9da4a45c55abf3f9122e4d40f550f2601a37c96669f6be75bfa8d42ae819b6823181caa2050d8d0de0ac96 SHA512 35911160a2038b4a390010c7584b9a0658fcd24b9bff42beebd3be75fb896fc3473e3e8b51b1abf28504fde8f16e888ae76ae1e21b2076908704304b1b92e5c0
 EBUILD bindata-2.4.1.ebuild 533 BLAKE2B d20286e4bd118bda00d14bf1f15375147a6ca65ebb81f7a7b17fbf4eb064775c5d4cc4c99226154e579f05bb619e4d519c790268556171b4261f56d883fb6656 SHA512 22b262e4f834a1eba30485cf7c5df1110e2f80d8cf8073169b20f5321f35e367c1beb94768c3089190cfbfb9cf82df209d78a839910cc8b56cd8391cf4278bcf
 MISC metadata.xml 327 BLAKE2B e926e11d19717f40bb9aea056ba01a7c6173eb5d543c16e422b4adff073b0fa6f5883959c5701bc38f4543c1905aeb3d3ed0f157a759c8b8cbe123bc4fa0627c SHA512 14518379027a13ae7c88fc04c6c3149dc3cc88f897a924734d14144a8343add641d5d419d4d0f5f296f27bb00d1590b399b631815e433b37e71348f17a082e38
diff --git a/dev-ruby/bindata/bindata-2.4.0.ebuild b/dev-ruby/bindata/bindata-2.4.0.ebuild
deleted file mode 100644
index 6c0d17208a79..000000000000
--- a/dev-ruby/bindata/bindata-2.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parsing Binary Data in Ruby"
-HOMEPAGE="https://github.com/dmendel/bindata"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/[Cc]overalls/d' test/test_helper.rb || die
-}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index cfdb6e8c2b87..90cfbec38966 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,9 +1,3 @@
-DIST bson-4.2.2.tar.gz 96725 BLAKE2B 62c40df519e185665f0c42bc8ab6a2d8472d123397f1ed1403e40254944cd423e6cedbfa014a03f6c6ed8a7cde94f8c26d06e784b82ea55f17a97996915381d6 SHA512 4de8950271f5fdd5927eda290b6506248012cb8a932d65773ad53f1e3e4c67ea17575b559447d5eb6c9286f672439879dbc89aa0cded4ec2d0fa35c49da7a574
-DIST bson-4.3.0.tar.gz 103341 BLAKE2B 29f7d870ce85e4984f47fda482b9ebc33986332eefcc3d9c5d56f7cc628e698a4a2e879225b81c6d0b1edc9e62f9b426f2510b67b51398a699d96de390544efb SHA512 c753bd68df5871a7cbed78dc68791a5d1c30db5975b70702742f12373afb754df8078d2bc6a772fd398815bca05a2fa020cc820a1ea9238f8b01eb492581b17f
-DIST bson-4.4.1.tar.gz 106995 BLAKE2B e10bf988c139ba4ffc1649f8f80dea0f7815c46ffe6d3bd35c522391879feb2996c161429bf4a5da2c092ab20fa9dcd544dd187bf3bb3a1baebb48df7c6be6d9 SHA512 740149ca01698998721cb6f585dd727ddc26ea770a16e5a6dc2d5faf6e52388ce8804a44b2c2ad1e52085dc810b522f4f320b72757c62cc7378ce6af84714d2a
 DIST bson-4.4.2.tar.gz 107429 BLAKE2B 94b3f694d79a3219a6e7b13f4dfa5935a1fec5ac99883918d61052786b2e033d8cd335013155b4b9069a730a3a87a0c0ec00b8b5ee5b89bb8c357909e8f67fe4 SHA512 a27a82fab17f596df986a3c81f1e73146a8d283bb16e8a7dba1921215e8f0e863b6996dbc107ede44546e750e4b19cc2dd934d290e25712472efd6cc075b9984
-EBUILD bson-4.2.2.ebuild 1078 BLAKE2B 621d2c66b6c5f941fa2279b6a534d232020069aa1ba55ad256e912945c51c73b823d486190679b47f33282bc947a15ed9d01117be35aa55394cb9adef64c8744 SHA512 d74d592a22fa0e30b90999478eb850f2d291118cb1bef2a8fa7af6fab934f20c46ba4ec91fa6a947302139ce9758d60cf004d3ed1604af3fc2dbcade09f4df80
-EBUILD bson-4.3.0.ebuild 1071 BLAKE2B 3d5b011f38e6e2d755db783d2197e12220e1498285b72d61c548fa3adcec7fa496951454d698c39cbad1478eb5d6e4f2f115d00496eacdbc086b43211898a736 SHA512 c22a648373baa986c0737a4875cd9a4efedc93e399cee6bd3d3e28f165439c50b4acdee7f64303acdaf5bdaf43acc690b291b245b9e4774ea5b41b6dd40dab36
-EBUILD bson-4.4.1.ebuild 1075 BLAKE2B 372ee35e7b8b096b06bb1c77086b43712b071f2b2768b4e4ee96518a32b52ccb14157c797a900b6ce1784e368172c37c606a788532993fb10aa0adb1aec4ecc7 SHA512 366c644efff28c9df13892e64abee9e53c56103d1c08a21c0c785448b476013acc0a8577517318e38b0ecba67de91e68c3e8cac96bae23e945f2bccaa1a758f2
 EBUILD bson-4.4.2.ebuild 1076 BLAKE2B 167cc4c37fea736e2e02b341cca067ba49a9c3851cc84512b3c080b5bd1d5a2fbd269369a5638dcb0dbc8c09f33b4ae803f13710323bef0b349a460b5c9fd5bb SHA512 c5eaa66135fdc0487115f0047c4ea2f7f2a6dbf1acd1b276ce606cf47fb06d910b3f4145f1f8f595b8a69057ffc2d9a83a2e9029d6a262f9c0d7d8d8685c0494
 MISC metadata.xml 343 BLAKE2B 45b4f3d9d5e86b9fee94d0b51c420d48c51b914adb49585c12519a81de40c555bc5ed48b03b751c7ab524464e46836a25d51f824c56cb03837f61ae071e1517b SHA512 a5fdde2808fc5c77be1a62a593215b8b619f53ffd8606e76db34a2eb2006deea409c64e85d6ba8a5b4089133265b6911188a9026c3698b44270ef8ce1f12967f
diff --git a/dev-ruby/bson/bson-4.2.2.ebuild b/dev-ruby/bson/bson-4.2.2.ebuild
deleted file mode 100644
index 115c776b44fb..000000000000
--- a/dev-ruby/bson/bson-4.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bson/bson-4.3.0.ebuild b/dev-ruby/bson/bson-4.3.0.ebuild
deleted file mode 100644
index ea7e0c78a4e1..000000000000
--- a/dev-ruby/bson/bson-4.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bson/bson-4.4.1.ebuild b/dev-ruby/bson/bson-4.4.1.ebuild
deleted file mode 100644
index fef1520820fd..000000000000
--- a/dev-ruby/bson/bson-4.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 5ae4e7d2b21b..3fe96e05264b 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,10 +1,6 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
-DIST capistrano-3.10.1.gem 77824 BLAKE2B 548c86c0740703a5b0b92890806411221ea7a9942776d88fc999ce998e3cf5842d809e293d05111ce44cb849719900c7335c43d3795d7147688d48d53a19a133 SHA512 6f3f11498d26c426da740873022767ded44e1be1aeadddd01772d1a5c43dcf2589d5cf2279625470e2e2733d60d3ec865a39640ad4a14b2ef9a64b3da2da579b
-DIST capistrano-3.10.2.gem 78336 BLAKE2B 782cf09f810fd91f4878e126c12d57d19b75c1ccdf3dfee7b2078904743bf51047d1f948e64e6c41460fdaf0a3a9e5a2b646bd6a797f8ce97bc29fab9ca9c533 SHA512 a7eadcd0b949baab2d6ad09c2243f71ec803f85b5c3cf455068d3b0889be30d0f6bbee4ef0bdf90b9c7ec6c3e01886d350fd8a70824366383f7dcc49f0a8c92e
 DIST capistrano-3.11.0.gem 78336 BLAKE2B f4e3ac2c796aae12ca575e1b5f1e42d993ad13580d790c3cc392322c40486121d8dbd7bf0f0fa75c3ee59396c0dd91164b2112d30b4270b302a9f1556fe866bb SHA512 d8b635de223a0574c17dff6fdfe4007741f823e24f376cc22129b709d40792d02965b72465aeeb54560f22522dafe255f094bde9a23aa259bca9d4933585e212
 EBUILD capistrano-2.15.5-r2.ebuild 1243 BLAKE2B 55ddf65a863b97b137f614c2216c098c9db1138c1022df80d6050793e15371320ebfa20bc9dbfc17e4f52c7caf65669c1b7deb476ad79ed42fa92e673afce1dc SHA512 d689d98d6d74a1ebcaed190d751124693c17798fd6ee4a6de96bc06948fc79c09afd19b2d2fb96997d1c3ece1a8f3a318609c8c5dbbc0340492841814b9ec9cd
-EBUILD capistrano-3.10.1.ebuild 1175 BLAKE2B 0d2b3411fb577ab260e2fbd7c8a69dba1f6314e21f254fb02b7119f640ad79fd1a3078aa88d855be050d89883f027a7306d05f6851a7c5ff7ccd54fed60a3a8c SHA512 4fd4323826ca08915b3443fe147c200d2ff81f16566afef94beced1fa02f4e45dad3c21ea254a5b490dac0b02339eb32291b0939ba8d58b923e57765d578afab
-EBUILD capistrano-3.10.2.ebuild 1175 BLAKE2B 0d2b3411fb577ab260e2fbd7c8a69dba1f6314e21f254fb02b7119f640ad79fd1a3078aa88d855be050d89883f027a7306d05f6851a7c5ff7ccd54fed60a3a8c SHA512 4fd4323826ca08915b3443fe147c200d2ff81f16566afef94beced1fa02f4e45dad3c21ea254a5b490dac0b02339eb32291b0939ba8d58b923e57765d578afab
 EBUILD capistrano-3.11.0.ebuild 957 BLAKE2B b762efff89bb8c34e5833db04db7c9618f7189411f8954df0dd679084ab1a279676ee3f6451a032576da954cead25a9db2ab4cf9aadf2753ff03f96997969e40 SHA512 7cbfc7e9bc0a3e20710d9d7d097bef038bc49046bea415126a285383187055316ecea8083f525b9d6b603a93a73f16923a83d7f99da25f6ab0cf7d7becaecdcd
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-3.10.1.ebuild b/dev-ruby/capistrano/capistrano-3.10.1.ebuild
deleted file mode 100644
index 4f29f3288d21..000000000000
--- a/dev-ruby/capistrano/capistrano-3.10.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A distributed application deployment system"
-HOMEPAGE="http://capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/airbrussh-1.0.0
-	>=dev-ruby/sshkit-1.9:0
-	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*
-	!!<dev-ruby/capistrano-2.15.5-r2"
-ruby_add_bdepend "
-	test? (	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Avoid specs that depend on capistrano already being installed
-	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
-}
-
-pkg_postinst() {
-	einfo "Capistrano 3.1 has some breaking changes. Please check the CHANGELOG: http://goo.gl/SxB0lr"
-	einfo "If you're upgrading Capistrano from 2.x, we recommend to read the upgrade guide: http://goo.gl/4536kB"
-	einfo "The 'deploy:restart' hook for passenger applications is now in a separate gem called capistrano-passenger.  Just add it to your Gemfile and require it in your Capfile."
-}
diff --git a/dev-ruby/capistrano/capistrano-3.10.2.ebuild b/dev-ruby/capistrano/capistrano-3.10.2.ebuild
deleted file mode 100644
index 4f29f3288d21..000000000000
--- a/dev-ruby/capistrano/capistrano-3.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A distributed application deployment system"
-HOMEPAGE="http://capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/airbrussh-1.0.0
-	>=dev-ruby/sshkit-1.9:0
-	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*
-	!!<dev-ruby/capistrano-2.15.5-r2"
-ruby_add_bdepend "
-	test? (	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Avoid specs that depend on capistrano already being installed
-	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
-}
-
-pkg_postinst() {
-	einfo "Capistrano 3.1 has some breaking changes. Please check the CHANGELOG: http://goo.gl/SxB0lr"
-	einfo "If you're upgrading Capistrano from 2.x, we recommend to read the upgrade guide: http://goo.gl/4536kB"
-	einfo "The 'deploy:restart' hook for passenger applications is now in a separate gem called capistrano-passenger.  Just add it to your Gemfile and require it in your Capfile."
-}
diff --git a/dev-ruby/childlabor/Manifest b/dev-ruby/childlabor/Manifest
index ffe9249f5fb4..59bc10c09058 100644
--- a/dev-ruby/childlabor/Manifest
+++ b/dev-ruby/childlabor/Manifest
@@ -1,3 +1,3 @@
 DIST childlabor-0.0.3.tar.gz 3120 BLAKE2B 555310e2b6b70292b580451b3627973a2cfc33ae0a8ceb5507fcc92ee70f388802644b1586c18736b34339418a9aaa6450f07e5353f3925a7238f02d397a640a SHA512 d18f3f90204b12e3b4a21be1439fcf44a4eb9f905402633966e6ab2a3cc9412a28c502a8c78487834a82e1de24f0f905691f33f443de930f670c70b17288fb6e
-EBUILD childlabor-0.0.3-r1.ebuild 989 BLAKE2B 769a2269a0044e5b72cf5bc9668b46e74d6ccc53b8b01a2d54c7b75541ed1146a542b0a7abd939bb2d29c704786e12a83a72742537424b2e21a70037825c6dc4 SHA512 83ea1cf539580172f6572c92860b0478c8ce2d558c40a9d52a43ce5ed083f4227b1009ca7c079371fc96cc6782ca092a23d186f2e554fa149c47fe8a3c9c9b0d
+EBUILD childlabor-0.0.3-r1.ebuild 988 BLAKE2B a6987bebbbab84b1372a10e13d5256a91233c3d88f72dd8a79bb8e6144e8554245acf17f56d4438af6cf4f367f0c0819be6ae77dc3f461f88d6ea92d8cf9ad53 SHA512 4ad958052164d459485081296f8e03e7bb5ac1b55b6fce740400c5a7e7454f41b884994e2d8bee84d44c1bb5c5649a78052bf9aeaf3eb2dc73d2ab2c196560a9
 MISC metadata.xml 347 BLAKE2B ea49d96c4573f6745df3c4c8860dea85853c85ccb5a808ef12a17ff29b056ec2926aec13637d11c9ab90d97937442ef57c5f4ea3ee6bed22dbf64102c4fe00f1 SHA512 6980c0bf12588c2926a0cd5bdbb7c976768764ef423587dcb9c061ddc577516f98d979092de978c9c7ee16acbc17eb30282560f505204f5a2da1e67a6f37e927
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
index fb73259d0281..4eef5fb6941a 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RUBY_S="${PN}-${COMMIT_ID}"
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 69e9820c2b7c..8e2ef6bd4b61 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,9 +1,5 @@
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
-DIST dbf-3.1.3.gem 127488 BLAKE2B 6c75d901b0d694266cfe2441567bf5684e5845a95b3c68eaf7bcbd5bc7b9b4748412740d8afce1015d5a84b26fcc30656a7f6dfc57c8a11055ac657b28cd034d SHA512 222957472dede8cfee42971ad9e7de4a08a7fb0ed017930027d4203da75298ce4eb9d222b841c4b051cf54c772b9799b2ee78cd5308452672142303bdf60c9f9
-DIST dbf-4.1.1.gem 127488 BLAKE2B 82fc54aee620b64e43fd9dae540b4447f5edfe880f4d2d217016503a566c9fedc9b79c1dce8ee3ef252511f22fe989a1d709c1d8392f8c9b068dc6f601e62b65 SHA512 76e04319e1fb88f7e061b80e3ad5b9043a85e0e2ae29dbcb3ec2172f8c1d3b63a31eb38e38e2061fa3a8a9094cc5f4b5cde4864d481255ca6c46acbc0b1ced7e
 DIST dbf-4.1.2.gem 127488 BLAKE2B ef371ddff415b89559209cd2d440e0c3359e39b9c7a3391940bcc25d96f61e2c57368d86430a09c7883d4cc7ba34211281269e8633a6dc469f70164266b03bec SHA512 47ee8d78ef31fe0017ae4223f06dbe576e43c0840b7cafb88def7b8492cba244d2382dea975a998355aec3aee31defd781bf0e08fbea6e77ef3dd5a927a7ad2d
 EBUILD dbf-3.1.1.ebuild 482 BLAKE2B 738e98ccb96a7a99f2debb2dcb04095da1d6358793b6606c30c3e1af9d9b9f2f537e493840eb173700407ce65552b174a1f452cfeb0a90ee1bad11177f8c5b41 SHA512 13bd7c11b6223c133c0081e1dc8b856051cfd8b8faa8952cc6942585238364e1d007fbc27f01635608527b0ae9fdcd903bbcb5ec8c0fcd7d438212d3741af882
-EBUILD dbf-3.1.3.ebuild 481 BLAKE2B edf2f9b62f9b42de84c52500e2ce6dff386b5427923edc9d10d55eab9266ded02b99367000c3f5686b2eb88bf9d01bb566244e67ad7aec6310bfb21f631cb9bc SHA512 47986acc778cc81e1c5921636bdcae7970cc8e7deccd6b7620ece6b49b8f5a159fb1647e056bf0edc61d74d3841cf8e4356fa93241a9ae6b2c16108cd673bb10
-EBUILD dbf-4.1.1.ebuild 481 BLAKE2B e5b317cd0c666a53b32120f954bc089595ce6870755db13d9ea9682e1e20d7f5771546f74223293f05fb38b9c543a46ce00a5fa026ba9d8d320fc93399b0b13e SHA512 a21c9e341b3b4250687191328a0c9b30ef186afc4c86fdd69b8040cd42ea17572d8db0b36ea1420a63115218bf7e7314701497588a8f56d131d69bc0300d78bc
 EBUILD dbf-4.1.2.ebuild 481 BLAKE2B e5b317cd0c666a53b32120f954bc089595ce6870755db13d9ea9682e1e20d7f5771546f74223293f05fb38b9c543a46ce00a5fa026ba9d8d320fc93399b0b13e SHA512 a21c9e341b3b4250687191328a0c9b30ef186afc4c86fdd69b8040cd42ea17572d8db0b36ea1420a63115218bf7e7314701497588a8f56d131d69bc0300d78bc
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-3.1.3.ebuild b/dev-ruby/dbf/dbf-3.1.3.ebuild
deleted file mode 100644
index e177a20ec5bb..000000000000
--- a/dev-ruby/dbf/dbf-3.1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/dbf/dbf-4.1.1.ebuild b/dev-ruby/dbf/dbf-4.1.1.ebuild
deleted file mode 100644
index ac660bd38e68..000000000000
--- a/dev-ruby/dbf/dbf-4.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 2a1bf71c5b6a..15463cc9c8dc 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,7 +1,5 @@
-DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
 DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
-EBUILD elasticsearch-api-5.0.4.ebuild 1140 BLAKE2B ff1cd7d1f718869bfcfc44c4936fce7da7aaaab4e6546177e2e431179a7105f68a0ac5faf2c412df21674a9dd1af8733eb26558b967b5b74b91c91b37c51de03 SHA512 83145115ca1c7965b25174d97d9605b87a5fcf028bde18d19ad42758f6834f3a15071bd8edc92b81ba3f16f5a0c971cb6dfd6034e5ad94117048c8e03d3da645
 EBUILD elasticsearch-api-5.0.5.ebuild 1133 BLAKE2B 41cda736b76a0122515158b0816d08dc0f5e6a6416772654dd5ba65657f362036c175f4121def0ea69e5ed6763a393ef92fdbb982fb1b5da6623bf1135628e6c SHA512 799d1b843fd684810f79a835fbd2026ae9e813a1e99f4e5d950398589f0ae9f38a420770bda06c314726e8fc0847bb504d3aed3fa23e2485bd31e2136c4aa55e
 EBUILD elasticsearch-api-6.1.0.ebuild 1161 BLAKE2B 2c0ea526d791f49afcf21492e8400588fd55bc312cca0038fe7e8f609f35670c74ebc0f2e10406d36b8c2e6fe2008e2f493900a17bcea91e56902d0d719becf2 SHA512 f5b8cb948946ae443225975813623a182b78262411b2f463a422e2a87b776e0a6fb81987c48a8e10882e48bc578c31ea14695c87f967046514f06fd6bc3a9756
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild
deleted file mode 100644
index d13733c73e3b..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 2232363f65cf..ee384e9ce83e 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,7 +1,5 @@
-DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
 DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
-EBUILD elasticsearch-transport-5.0.4.ebuild 1129 BLAKE2B 71f1750ae738877dc46203efba2b3e9273d0e035927f42f17153e58806531ef4a5d0e5c8df4d7883bc2e4b5567a9e81f8a7e3afa6985365174e79bfcdfb3cbb9 SHA512 0ed4dd9a9893186cc3bcde5d8f6a16e0158c76c47619018d596e308397f287518dce71d03bdbac9f1e2209306bc46dae854cdf4daa27922217aa5ba36b929e31
 EBUILD elasticsearch-transport-5.0.5.ebuild 1259 BLAKE2B 47800a95fcfc34d1431ce18379199a6c0b4b08941076a1d9b48a05a6a5af099a6f17925dc16cc19da688a77f0b3f3c70a33eee8538ef8b4573adb4ca1beb7c73 SHA512 3f600001e97a6e0833b637010219eb0fae8e01421380af6b10f6be3afec9cfac8f40ca3d8a5e932b9cee152eff6be9e76e5a7083d30bb6b4335fa2c1829572de
 EBUILD elasticsearch-transport-6.1.0.ebuild 1287 BLAKE2B d96821cd23cde49e90692702e98a98c3119c27d1dfd6794a01dfbfec4a553289b5c12b7a2199ff5089030936d3e591d3a4137d28aed3e86cf21b0ac2812640d6 SHA512 57e1a6024da309130f6820efdc4346a7ebbb213be3d9f958978368a27f387220e3edcdb3c960a6c7fa25737a6fdfffc670db037f9c9a1762a4cc55c30b98f2ba
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild
deleted file mode 100644
index 4632c06b875c..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 44a7b89dcded..14464eb16a87 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,7 +1,5 @@
-DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
 DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
-EBUILD elasticsearch-5.0.4.ebuild 1177 BLAKE2B 3f60333df1beaafbcd23652c4d75335d48811c9e00326b303ec133ddb5b546c49dfb5926d4fb04b4fd09ea6c18381277c6e025fa04a1033a895773682c8db93b SHA512 1481cd35b95c2298b340ee841fc41f03720ae5072ba09baa8a85db1c587719fef8855108ac296e02e611f135508de5b6497bc19417f4d3951334d2584e0ba00e
 EBUILD elasticsearch-5.0.5.ebuild 1170 BLAKE2B 22d0fc7196747dd85537cb2a3d868e0a69892c68111f121d171b9cc776246f17914706610c1d456967f099c6a28444f463dccdfc9cc3b87f1c429a061609eadc SHA512 82c3fff22a34b7cef89fce10b4ee9f4dee271fc2cb72d91581fea8970275f7392aeccc70485fc6b5c2b406ead47eb9b66435530e26176210866e7d199a46d6c0
 EBUILD elasticsearch-6.1.0.ebuild 1212 BLAKE2B 48ae9f91f475ce090b78e392d311df4763b433ee80f3c5cc4f20b730c042850aa9cfe9f69ef68f22697f460b73e5eb5769bdbb188c025912152a70b9669f5996 SHA512 911f5178d30323b89c158a5cdbe01eba7f8995aa65a8f74a322012206b570b17b4e0968ac9817fd1c672f292a8db9ac6cda1e45c08dad77824d3617b5f0d08f8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild b/dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild
deleted file mode 100644
index 71731bacc022..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/elasticsearch-api
-	dev-ruby/elasticsearch-transport
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 0c07329b947d..0a73e6175cbc 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -4,12 +4,14 @@ DIST facter-3.12.3.tar.gz 391836 BLAKE2B 60ec23ab9df0d6ca069608c897949be8aaf719b
 DIST facter-3.12.4.tar.gz 392011 BLAKE2B 5e3d7ce65eb6c35cddba70b2b397cdc9c591a6c420a58a04ecddabdc537f0f799c510d14bba436aadbdce9c9932a28b6b36b893526a7727c8017c79827a97b9a SHA512 952bf1ac4c67bfb5170d31bca471c317211523804a14bd39f34b4fd0730586b3764499200b5c816d4b6bd0338482ea8bd83cedc5fe670db38ea6ec144b6e2e94
 DIST facter-3.13.0.tar.gz 391833 BLAKE2B 8fabb2ebb438975564a770657866c6ac8ac77394c4e3cdb635eae78a744a097ef5eabb4307092cd2b9cf12b4db70623b18b3ca1e2c9e1a248825a2bf53b76565 SHA512 f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de
 DIST facter-3.13.1.tar.gz 392008 BLAKE2B c08eccbad8210aa8f75563566b84d8a179fc90dc74829c8a325a0c20d96189870cc4f59eb46d12603a1e3fd12650eebceba39a6553a54dcb0138c37c5d94395d SHA512 22d65d3c7eeedc674b99dcba1503bcecdc268abda0f25e6e209f1c3560dc8077b13fc5a6bbb8de1b45f2b7f5d1f2dfec8aa4fe20461a1b1d6a1a65674f570e56
+DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-3.12.2.ebuild 2415 BLAKE2B 1dded0b152090abc05db0a008088ef00e208add94f75cff29527c15bb1465e6252bdc613cf658e5e5126d3fd69966c8f47f637801336b9a3d24f351871f5179c SHA512 8a89678c3623b723594b70884a634214e34430aee18a28cd98d93746d559a4843841b5194ba968c76979e97ca6d2fd8a9c45948ac8c10382e97b33af2f69be82
 EBUILD facter-3.12.3.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
 EBUILD facter-3.12.4.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
 EBUILD facter-3.13.0.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
 EBUILD facter-3.13.1.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
+EBUILD facter-3.13.2.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
 EBUILD facter-3.9.2.ebuild 2104 BLAKE2B 657616098817dc41ff43f1034dc697789e0e971ba0393ebe819e52a171cbb2d2a757aaeac60d4797b98df6a043b6afd28720cf79e6ae8ad33eee1ace71bca9de SHA512 49aedb61355c7b9a5f48b8be4c7fe76c8e48526470e094ea4491d8c36df5e97ae21b585bdd2d8afb932ed8bbcc806e3ef4d779d514fd8eaebc3b99c05cf68e9a
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.13.2.ebuild b/dev-ruby/facter/facter-3.13.2.ebuild
new file mode 100644
index 000000000000..c6ee584a2aff
--- /dev/null
+++ b/dev-ruby/facter/facter-3.13.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib 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="debug 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
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+COMMON_DEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${BDEPEND}
+	${COMMON_DEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# be explicit about the version of rspec we test with
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	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=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	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/factory_girl/Manifest b/dev-ruby/factory_girl/Manifest
index 931f12b781ae..6a4b5dd4e152 100644
--- a/dev-ruby/factory_girl/Manifest
+++ b/dev-ruby/factory_girl/Manifest
@@ -1,3 +1,3 @@
 DIST factory_girl-4.8.1.tar.gz 66262 BLAKE2B 6a90581ef7fe7f6e3d244bceebd10a4d725731ff2a7f6aae4265a6d235f5ef4f1069a0f1f2fa55121c9112b245dc947378745958583e9380536cc797d881a3aa SHA512 2c27eaec8351b009bf200e10829128c5fd3e73b0383cebf7f3ccbe062ba362b29f25e5c054ed25245202c85c6ab60c637547a8f3719e2f079c86c83c30db48a0
-EBUILD factory_girl-4.8.1.ebuild 1322 BLAKE2B 68648a2b99bbca17501728f8da93e1d7ffed5285f428a8d2e7b9a35f6739fc0d06ea8c334465ef5f543bcdc4dd85ab2c29ab7dcaf053c293c4bc5be7138cbbb1 SHA512 ddd96a37cba1dbe307cdcefa7523b9d3a929cdc79a11445c2ee820b35a261f648df79037bd042a8cdc3f8dceea2b33a6778f0549e08c25b2af584fbcfb95c0eb
+EBUILD factory_girl-4.8.1.ebuild 1312 BLAKE2B 47220fe4f0e00febe95f1bb7c5fd5991e55c8c1a3517aa3ff3c28f33009420070d9ccef4ca1416ee13413cb97bccead1989e796edb883f4dd696ac3cb9187114 SHA512 4280b19c833c20b3166baa3542397e8d8255beae015452090717cb2a459944417dde36eecd6cd14d8051eef7fe566d1c36c28ee3f80e7571deb8b204d5e8fc06
 MISC metadata.xml 345 BLAKE2B 290711818c63550c33c47e1314d2e5a800f9229f44958cc06e5229a028527b455a7e7a2335fbc5e261d8b80f6d2d51e5926bb52e5d6db44d38c2ba8288bed624 SHA512 312e983fd6273c8664ddd317a6242d8176bc1ffd6f3be4842d90f4a8167c4a8e30acdac203812ead05d878d42c60588e74aaae48ee48ed0f4aa98884ddc6c6fc
diff --git a/dev-ruby/factory_girl/factory_girl-4.8.1.ebuild b/dev-ruby/factory_girl/factory_girl-4.8.1.ebuild
index 936a4af3f63d..18e3c4dfade0 100644
--- a/dev-ruby/factory_girl/factory_girl-4.8.1.ebuild
+++ b/dev-ruby/factory_girl/factory_girl-4.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index de9240f5703f..e91867ffe511 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,11 +1,7 @@
 DIST fakefs-0.11.3.tar.gz 44888 BLAKE2B 498dbcbe12389f27b6c6776425910f91ccc45ff85db1fa59e4fef8635dc9923294dbc979df2d10846d1435e81ee6d622190d3195399a4778d00bd4446edd2571 SHA512 9c9e18337d3c461fe4b5a4e6ede17cd840959147e66a57eb61fa203d8ba95d5655885d3e5b776ecb3a1cee93488dc711d1b2bd28df23bc131195e311229c329d
-DIST fakefs-0.18.1.tar.gz 50861 BLAKE2B 71d2a8d34874e42f5fe827d0377ef9996f67f96b6c2b0a194f71c8597b9f145b4b762424fea4727e21a7261387ca43f783a67ed3250fa41cfb395ecc9b51cb6a SHA512 1cb11fc384615b9fde03c318463220abd76ca4043038cdb1a74f7cd94ed5c23cb6cb8ce47b40fe145cf8db7707fb10df1357d6f09b4e918b05948ed5b807ed27
-DIST fakefs-0.19.0.tar.gz 52718 BLAKE2B aba7cedf9dd2f365365b5785ac390b82e1d743eab0ecb13aa4a661ebda099b01a1db3e59003a52b6d5ed404927024d13fd767f3f4c00eb1f3094b84d74614860 SHA512 ba3a24854e1751ed454bc0b5243fd4618092cc7e3606371f48f96ba81571de3e5cb33f95360b0eb549b2efc6fd21fe7ad272082dc0b7559e375551a8922ea2cb
 DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbce6d33d3710fcdbd936b4599561c857dfac81f13262da6f067a843d0c3159abca0e8be7f77c95ff20e8bd123a SHA512 e27eedff44c3ff556b0e7a22e434205e54847a6f6b03a8ab7604c2f2e9abf8be7d5b8d29bd51e24cc032dfb3aaf7940060c3dae5532b0921e363d2213b12ed90
 DIST fakefs-0.20.0.tar.gz 53591 BLAKE2B 067fef803bb0efb50f63f0c0fb645bb4d0d1c00d198cdf367e99871c6cb9e28cc1d4f0a52318a61c446577aa58170143c2aea4b0b826136610430abf996d03aa SHA512 9f9b2cef58709f7ab1147602b2f47d6a0302b217cc7210537605491f9db6477183e5fa447974c0572f1a1fbecce1029e451241d44b5f96eec97a7521275c165c
 EBUILD fakefs-0.11.3.ebuild 1098 BLAKE2B d31a81a83d641186b7780447a291fab0812191766b5a6600ded1e365d3ffe1807df11ab4bb557d60782532a67cf13b05c5b892fcc8fadbe536eaf3cb9c3a6047 SHA512 52832e5b6530397c423f3ebfa64c7fb9b60e52acc9e5d84aec735a784130ecc75a604ded3cba48979c4e511624e90bbff8d9e3dea9df9dbde84a0bbb8c40f53b
-EBUILD fakefs-0.18.1.ebuild 1108 BLAKE2B 2aa855c4dd2eba585807571ac5a938286920ad9a99aac4033240acdd5598a2e905993e2999b26fcd7031b91af85755087539ce363855c82b5d03ef0bf86b9053 SHA512 eed7c2c586e324dcb07ede4b54ecc306c1328f2cedcf1bec73dbd6ead75d254ceba48670549e2f28ad9caacb6a3721f2da767e352bfe834abc8a59eed2491721
-EBUILD fakefs-0.19.0.ebuild 1108 BLAKE2B 2aa855c4dd2eba585807571ac5a938286920ad9a99aac4033240acdd5598a2e905993e2999b26fcd7031b91af85755087539ce363855c82b5d03ef0bf86b9053 SHA512 eed7c2c586e324dcb07ede4b54ecc306c1328f2cedcf1bec73dbd6ead75d254ceba48670549e2f28ad9caacb6a3721f2da767e352bfe834abc8a59eed2491721
 EBUILD fakefs-0.19.2.ebuild 1108 BLAKE2B 2aa855c4dd2eba585807571ac5a938286920ad9a99aac4033240acdd5598a2e905993e2999b26fcd7031b91af85755087539ce363855c82b5d03ef0bf86b9053 SHA512 eed7c2c586e324dcb07ede4b54ecc306c1328f2cedcf1bec73dbd6ead75d254ceba48670549e2f28ad9caacb6a3721f2da767e352bfe834abc8a59eed2491721
 EBUILD fakefs-0.20.0.ebuild 1108 BLAKE2B 2aa855c4dd2eba585807571ac5a938286920ad9a99aac4033240acdd5598a2e905993e2999b26fcd7031b91af85755087539ce363855c82b5d03ef0bf86b9053 SHA512 eed7c2c586e324dcb07ede4b54ecc306c1328f2cedcf1bec73dbd6ead75d254ceba48670549e2f28ad9caacb6a3721f2da767e352bfe834abc8a59eed2491721
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.18.1.ebuild b/dev-ruby/fakefs/fakefs-0.18.1.ebuild
deleted file mode 100644
index e529ce1f1e18..000000000000
--- a/dev-ruby/fakefs/fakefs-0.18.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-0.19.0.ebuild b/dev-ruby/fakefs/fakefs-0.19.0.ebuild
deleted file mode 100644
index e529ce1f1e18..000000000000
--- a/dev-ruby/fakefs/fakefs-0.19.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index ca8af5d398b4..acf92f323852 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,7 +1,3 @@
-DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2eb4d03ac7ad04e1873666db9e2cec1e6eb9887364874ea5f32d0313019d1eada5e05e25e0415bdd5aa2bcfca97 SHA512 25bba07e76a2a8bf02b0c81c045329e72d5911a2aacae56611db33dc25c89bd48bb1b4de9b20c6edc1514d3ceae8b06fca6076c85580533047c222cb30ef8dc7
-DIST faraday-0.15.3.tar.gz 67065 BLAKE2B 7425fb885cb26394ee91098264b5e4e3038a68855b9a55b03a39faca18d4e0cd516fe447b2312538692229bb15df091317ee36aad762937b46c72e16bb19cc8a SHA512 cfc59c44481e4be27504d02bfcbdc3a3783d15940487e72aaba136f5c456d74be6cad5a686e74eed1ad216fbb58db197d04015c2d168abbbaf899c4f855acdbd
 DIST faraday-0.15.4.tar.gz 67196 BLAKE2B 4e64e834639a6e59c028ee19d72f51ea72fd6b3be5fc63b6fbbec25716dbd735e97d8a05a210dd1a57b740a1dcd76d30a39b59c7034cab8a531f8856dc132b14 SHA512 6d1a8c66bd6e2ce417ce504bf20ea89cf24c46c2b48491aba110d04f273448e0e8f0cf94a0dd5356a13876aa030d41bbfb80b95365ea4b212fd79d8db624128f
-EBUILD faraday-0.14.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
-EBUILD faraday-0.15.3.ebuild 2014 BLAKE2B 2ddf21327dfc2f04a4ff0461a31fa3cc3528a199a112e86bff697d43e3a810dd595de48cf60d8be86c82d1c7667d75416955964bf048da33ae551cfc4795abe8 SHA512 2b21286bfccf32820b59667aa23d9f519200cc1f143bcfddb8ca6a0b4549c3a9636c7dd59e5bdc6d9c9de42adae745e6a948193313899030f19d3f4d728d21ef
 EBUILD faraday-0.15.4.ebuild 2047 BLAKE2B 1a2b1fe6800179672d9d1ae360a945348c2b71c9f60054b9d825b813d7793467a9404b349c83c119b285c5c98a17d85569859783056962a40ea900d43e4493a3 SHA512 2b7829fb1562edb31d1875786561abec8867606cdf326b61fcf7fa208ba5eeb2e966071fb747315286d08d5e8db29cde5d368065f85d192a26d5766af72f4aeb
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.14.0.ebuild b/dev-ruby/faraday/faraday-0.14.0.ebuild
deleted file mode 100644
index c3f9a9825f02..000000000000
--- a/dev-ruby/faraday/faraday-0.14.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "rack", "~>1.0"; require "yaml"' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.15.3.ebuild b/dev-ruby/faraday/faraday-0.15.3.ebuild
deleted file mode 100644
index c17052d85c42..000000000000
--- a/dev-ruby/faraday/faraday-0.15.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# Remove tests against live services
-	sed -i -e '/test_dynamic_no_proxy/askip "live network test"' test/connection_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 8a9011b8b90a..1f9bbf5c0ad2 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,13 +1,7 @@
 DIST ffi-git-1.10.0.tgz 166192 BLAKE2B a663da1272a41464bcc3fd6a69055615beaa75aca09da60a4459034230ddb7768573e6a91e75b0e768f16333f23e55e045b6cff3be63c5138c85070903cea869 SHA512 f4a7faa02eda8e67b4c05ecc93ed1848daa9d55ec2eaf367947dbb4cf6b0edd76db1e8232db0a17828df40c3cdabb9f7edac11b44f9de00bdb69d0c9a84d4409
 DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611ef446de385deb533d8fcbff0ada3f1865599fb51e3446df629c16d491c476e179cfa356c7d8c84e1827b2729 SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945
-DIST ffi-git-1.9.21.tgz 161824 BLAKE2B f31f9caca1c6f90d7f6bee7756630fdfaff527a96735b3a80ac1f5f0c1a860d6ac6500da06c96e99527a2e75de0a839067d1171cdbefdf9401df101d59b38d4d SHA512 c3049baa2aada3deb1d5a029ce659f802cb0533e2fa6ab6ccc3a45abda4a97fde7964dde314f45e93e4ec3e73f66aa53ff8f7a397a12c70e191f4ddd0b3ed063
-DIST ffi-git-1.9.22.tgz 159304 BLAKE2B 096f625d6f1b162cc99f70b9d0783f1176e0d9faa65dcf06c346ef0b78c495a85c50dc728b302bbd9a8648d4d589eea56c0e9791f6065bc5a87331bba92e9656 SHA512 0e2159133629f505de233fa44a004ec74196488540552c8036640c7dd770fadf2b90987096a48ca796ad98436dd63998bd4c7f8b01c871755be49b1ef6045642
-DIST ffi-git-1.9.23.tgz 159194 BLAKE2B 70b651825962c81c82795bcac1c116ef6792d1c2e75e93459d600d1633bb127a9693b58226c7a4fd60a5e57bb2bf9df95d5cee9ef32b9a1eba214a8932bb8802 SHA512 39f862b8f946e67f84f915e015b895d137d68d50b90585c0ce9d4bb9dbcb5c714653c454635ac10b3a71290811f1afb32da90bbeb430dd589245e592fe55c70e
 DIST ffi-git-1.9.25.tgz 164209 BLAKE2B aab3addb5d9138f81d0688ad628082e7aef5f96a1b046dfa57a7195dcf7432533052bb397ac8335f7b17ffece9424fad7d986065a82ac91437e0d8d27d76ac77 SHA512 94a45f4152458d6aedf50645c8074626dcde4326093a606e509c3fbcaac79a1e6a9f7df624f14946db4f3767ef6fb3e311e60531c209676e66ebbf21b07a6786
 EBUILD ffi-1.10.0.ebuild 1552 BLAKE2B 585d5be6c8ee4c59ce19767a43bc7c0fedc0dc27c9c94076d49e84156b3b0cfb17d2277cd31be1dad0be399b30fe8c7ecafb72b166bee4e61a8e498561422f97 SHA512 167427710f3068457893e51a677c1b6041cd56ef70afbf45988aa762fa4f729360858b6ea3b26958eb364973d80109f57b84da6edb707703f66272060bebf877
 EBUILD ffi-1.9.18.ebuild 1539 BLAKE2B f8a42a2d72c94d76b9f9c4178c212b429cf799ee912a7905e806a3aa14e16b361efa873feb00ce1aed50b9e8e0357029fbc805db2596720dcf6c4cfeeda1f168 SHA512 9bb9f63adea8e800990926785cb52853e5f3bfe8cf658381dd87da9eba60051d9d344b53c420816a5e31c29b0d0de88d70542041211118da7a2637d50a8b6bb2
-EBUILD ffi-1.9.21.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
-EBUILD ffi-1.9.22.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
-EBUILD ffi-1.9.23.ebuild 1555 BLAKE2B aae39f0cde3caf9a343ece5e11b47c00081287bd56a4ed442ac8ad60371fe3bced91b6ffe7ae13b2b916190f6cbdf585264a850f5aa5ab20851ae17c058817ac SHA512 2f2b0c5be104a1e6dd82c1debdd641337022af734fba364454c6369dc3e1bcff9a349e6d2e73e624f7af63fd0b7478f118154cced53f2559157fceae520d2425
 EBUILD ffi-1.9.25.ebuild 1548 BLAKE2B dc9812d8065607919f23e97c7ba5556ff174d64c94fafdf8990ec562b91a99683968e89402549ad6133c472cb087fb625333009c8f8082a517b156baf32af8ef SHA512 943de809394a76536643d50869277875cd76ff70d11ff3446f5bb8a99ac4d93b46012af0e52ac9530ec39164bce3f7ee98685e29c80bf399d39795d2f1def5f4
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.9.21.ebuild b/dev-ruby/ffi/ffi-1.9.21.ebuild
deleted file mode 100644
index f6c709230ae4..000000000000
--- a/dev-ruby/ffi/ffi-1.9.21.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" virtual/libffi"
-DEPEND+=" virtual/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.9.22.ebuild b/dev-ruby/ffi/ffi-1.9.22.ebuild
deleted file mode 100644
index f6c709230ae4..000000000000
--- a/dev-ruby/ffi/ffi-1.9.22.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" virtual/libffi"
-DEPEND+=" virtual/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.9.23.ebuild b/dev-ruby/ffi/ffi-1.9.23.ebuild
deleted file mode 100644
index 0ddc77ad7e9d..000000000000
--- a/dev-ruby/ffi/ffi-1.9.23.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" virtual/libffi"
-DEPEND+=" virtual/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index ada43272ec1a..2450243fbd05 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -1,5 +1,3 @@
-DIST font-awesome-rails-4.7.0.3.gem 637952 BLAKE2B 783a7dd495f12da569924f32a381a6a3767b06372c240f69b1f94a3569ddcc7ca239c729a7dcdcfb9af4e8f3c73c6c74ff134ba590ad9aa7e060b6bffaeb3d09 SHA512 b4d9c45dcc6b3ffa1175fa2a2d2727e50944c62af70798fef70645749a2a957300a8aa9011f8e1a8cc0471e0880db352390917f118890538d8408b2965b817aa
 DIST font-awesome-rails-4.7.0.4.gem 637952 BLAKE2B f964a71357ceaf185974b47302b589ad48c6e10bc809fe7f36488a4462ce2059937f003fe2743a984130f63603f5b39567b02495df847b6998552f09762fc440 SHA512 d8b2a7fc8c17db0e627055bb3640c223b0b266d1b9d4e0f0e96291e6f40e24cd35ba8cac4ebd0d1cbf242f6292b3ef182dc104aa569f3fdd5a33709e2ee2c50b
-EBUILD font-awesome-rails-4.7.0.3.ebuild 507 BLAKE2B 58bf2e56a725484321eff6dc3ef772d8f6a50803b79fcdd48af8af2092d13f966586789cc18c2d0a1ca4449ab51f9213a4767bec195a1366cf40dcb4edafa5a1 SHA512 dcd8f887297bd5d39100d8a06861edc485aa4aa543d3b934a4e6a8ac3497b421f705611b7c619adae4dc79299aeb900c5b2b47f75bf560fa9e9f6b4fac39222a
 EBUILD font-awesome-rails-4.7.0.4.ebuild 507 BLAKE2B c1433f7edb8936879e7c6a629ef135698c2534398e2b60c586c5ed190cbdef04b7fb321b3809b1333bf68be4b4aad711350cacfa780721ada40db18558cd2041 SHA512 0c440e121f9fccfdacc63725a879443c7d02ff7f76dcb94b86538a4ace2971584f038e1906398182d769fa21290152acc81c76ffa742f674b532587ce065eaff
 MISC metadata.xml 402 BLAKE2B 19fae051a5a4cfac29c1e758ddde9a6e7d84651197fab379d1c4151c020059b118f4315fcf179c5545b209cd1b84715b3568443821d89ad8cc2f09e8adfbb3c8 SHA512 bfe7b861172d217672aa5de2699621b309e733255de720efbdc740991206e546666a4af42f26f45253dacce55d3db377a0cadea7cf15a34df8291e0e7184a5f4
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.3.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.3.ebuild
deleted file mode 100644
index b1bccbd217cf..000000000000
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Font-awesome for the asset pipeline"
-HOMEPAGE="https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails"
-
-LICENSE="MIT OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/railties-5.2:*
-	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index ce9c5a1adc56..fc18748cb562 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,3 +1,3 @@
 DIST hiera-eyaml-gpg-0.6.gem 9216 BLAKE2B 2578195d92d4edbfef9184ea8d9a72f2bea3c67a51ab95579292859c81f41a199ddb92a0168f209548354b3365c66593d48df1b9dacb9774df42c3439305f8da SHA512 bc66c5adbbb4e861ceab689f0695bc6d36b8fe5ecc9e42d03f2640c4264b65d93a19e829edae8aed531f101ac2f41dcccd676741323011a83f0e11944c5204cb
-EBUILD hiera-eyaml-gpg-0.6-r1.ebuild 506 BLAKE2B 58fc226b617fb57eb434e1f5a41f6e461fe76d8bc2533c0e1f6d78a5027814ba2bb160423e1eefae063228137807a2b1919da3148f15475760ddf212972c0f93 SHA512 71caf274361b14bf562577c1d22110a07571f964fe61f6b89f85a527c3fd9ef6440593c6fd0a3b5b18f90b9283105fa6840ace78de0d43d526105e35311185a1
+EBUILD hiera-eyaml-gpg-0.6-r1.ebuild 489 BLAKE2B 454d9e330e41b015c4d62c9ffdc4f643898089a5c69aec01e012fa847821950847b941585e951fd5f8e4ad04014cc609ec7b54a9a4bf0c1058141beae022af05 SHA512 eb3ee5b96f7a5a912357ac640b14a7e67a97e31e10cba9d46cf236dc075efd66533b4b984021252bacc25cc27a3d003f009bee9dbe0db1e2f67aa2f1ed6c1b49
 MISC metadata.xml 473 BLAKE2B 076b7ca0bd642db56643c593070270ec77bccfed2f6ca545571e291c5faa7ddbf437c7216c3d115e8c646e41ff2914db4e7e9c6af0fae792cac38136caf04fc9 SHA512 5c9d09cc98b71839551598112cedf87d6adbd9311f126400527c61a8827c708d69a62bf84d4e269373729426740aca87060f7ef3467a0d3b5fef60920e811a21
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
index 031a46a59c8d..5636496434fc 100644
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 75473aff2bc6..ea306f9c9e9c 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -5,6 +5,5 @@ DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f
 EBUILD listen-0.7.3-r2.ebuild 900 BLAKE2B 11e9754c6f746da9168889e7b982055c6d06b271cf3724ebc4dbc8df776df02c743ece26620b2be54ef68db32f6c1638c92da0c0ef5eae5090a0d274b3e558dd SHA512 f61ee299ed7fbd237c9dcc4ef3174a80bc86a2c19065d2df3abf93393649a792bf0a103a11fbe12cac16bc655ba31b977aa269feaa86b5b905652fdfc4b9abcc
 EBUILD listen-1.3.1-r4.ebuild 976 BLAKE2B afda93382659828446a14b6536e66d4d52e962ead6007d60eae34a7b67958fd94d755b59347183685ee9d93221092fb5063ce1d3bd2e8cd36a7f5db2f61044c8 SHA512 c6ccce9405650484e343cbbf8306a36486ecdb09ef1b4519861968d6b34b5bdb53c0a5a8cd02803fc551db622b4c038694f554995addd1e3c7adb467c2b5b3f6
 EBUILD listen-3.1.5-r1.ebuild 1239 BLAKE2B 7b99f34669fbd30d271f16269f888cf50db70099b88739cf90256ac14b4daa3b3c9c510f491f17c08d6e09bf2114172c25372554060c4d9bbb6c5ed76fb39208 SHA512 b0e53cc835926b8a7dd3d78301193abbe653d1494e999e072fc56e8857f2a5f5c7971e6ff61aceeec1849f4e77b249792c7df761161d0580bcedccc2b3704144
-EBUILD listen-3.1.5-r2.ebuild 1217 BLAKE2B d9dabb9c29deea99845f230e40d30ea8a0125a791c5efda77e8aab482a2de501830e8fa79d82422d4f64727b3ad3839eec2e940521037bad92597b66702f757c SHA512 6afac74e250de69c7a9e741bd9427539eefa387b66cd7ff2b1b1ebd7cff320b4eb29626cb874cfebb604cb042d38a86d4e4d9a4eae26b9c6b5ffeebe3fc3b860
-EBUILD listen-3.1.5-r3.ebuild 1266 BLAKE2B ca4bfd134037d311f46c408df6527cfba56969bfc9960b108c0668f2451e2d39ae4dd743ae255d4bbd0ebedac7a14c0a8556ab9b1c210f4885473be6d6224ade SHA512 ab675400efdb5220e0f327f86ef45d8a11f35732025e80da3d53322b0ffb47b0817ebf26c3606c877c9c3c9bc9ad1e7164761c05749c928a6506233a56fd4fdf
+EBUILD listen-3.1.5-r3.ebuild 1265 BLAKE2B 4fc485140539b9d30947adb238e805b56a923928b13d0c6d64d2a51d90f8d02771522683580365788e321e278be7aabce811e67c9bd268a1948acfad9fb60137 SHA512 187b23b7947f7aaed7120902cbf5aecb777641969b9f6241a122af1118a6762d9f8d7254e6ee535a1db46cdac12c1f68768bd27f8cdedad97dd6971e78734f4e
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.1.5-r2.ebuild b/dev-ruby/listen/listen-3.1.5-r2.ebuild
deleted file mode 100644
index 2c24bcad40bb..000000000000
--- a/dev-ruby/listen/listen-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7 >=dev-ruby/ruby_dep-1.2:1"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.1.5-r3.ebuild b/dev-ruby/listen/listen-3.1.5-r3.ebuild
index b34298d01ef8..e92709eaed22 100644
--- a/dev-ruby/listen/listen-3.1.5-r3.ebuild
+++ b/dev-ruby/listen/listen-3.1.5-r3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 138fa15f8683..9a3de9bb0e59 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,9 +1,5 @@
 DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
-DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
-DIST multi_json-1.13.0.tar.gz 25954 BLAKE2B 22a2f2ff2f1291a45613f456661a1735fc41ad80f28ee7d2c9b97109f0637da4e60439686cfc29b7ced501c32d2fe9236c9acc25acc0f55e57ec0bfe53331f37 SHA512 b168b2a093865f48f1a4d1941e8cfead8b3efba73bcd59660dae581a77ab7149f0f452f1280e69061187f35c84b6eeff70144f815f9f669db03dba49100143aa
 DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
 EBUILD multi_json-1.12.1.ebuild 1928 BLAKE2B e145efe7580001ff4e92dd2d524e08328de8b1fc6bdf8e958f7a4a3928baf9c01a1bd26a6e5db16c8d5aedebcede110872ae60db7e066df62b51d6e872e75236 SHA512 dd0e27bebc519457ef67e425889e515aa77fe8adce279bd265477ccc2b8fe19c93f884fd8dc1b8f65b9602246370ac46a8e8a6edba22c549b3c5285d66af462e
-EBUILD multi_json-1.12.2.ebuild 1925 BLAKE2B 341208e00259c755da24e012827dc503ad98bc043d83eacb9f8e23afffaff63dd269713579c3d958513a252e4976a5329afafbb80aae796ccdfc449a9c8029c2 SHA512 141fc97664656e3a112a109883a0fb37cb2f71793c6db1bdf144e9485f2f9ee321393e74f55f336e46b6e206b0f2997c70296b4ca4c0e1cce734894371446175
-EBUILD multi_json-1.13.0.ebuild 1925 BLAKE2B 341208e00259c755da24e012827dc503ad98bc043d83eacb9f8e23afffaff63dd269713579c3d958513a252e4976a5329afafbb80aae796ccdfc449a9c8029c2 SHA512 141fc97664656e3a112a109883a0fb37cb2f71793c6db1bdf144e9485f2f9ee321393e74f55f336e46b6e206b0f2997c70296b4ca4c0e1cce734894371446175
 EBUILD multi_json-1.13.1.ebuild 1939 BLAKE2B 648fd92d37bf3391b13f4bdff6b923c081660f80ba25368826eb29bc2f67ba8f181dd50b554ea1d081bc99f5275a0e152634ed9dceb8a02b704beb2af5fb3c34 SHA512 6a87d57f0ad87df360b9b8ff8d3b4b3dfffd08878954189de795216228f7f961583d443a8360759f32bea1eca1ac25aac8b4508bd45adad425486ae0e0f12244
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.12.2.ebuild b/dev-ruby/multi_json/multi_json-1.12.2.ebuild
deleted file mode 100644
index f75a77f3d895..000000000000
--- a/dev-ruby/multi_json/multi_json-1.12.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd ~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/multi_json/multi_json-1.13.0.ebuild b/dev-ruby/multi_json/multi_json-1.13.0.ebuild
deleted file mode 100644
index f75a77f3d895..000000000000
--- a/dev-ruby/multi_json/multi_json-1.13.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd ~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/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 2ba8a32171fa..d64c179e8805 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -3,9 +3,9 @@ DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db
 DIST mysql2-0.5.1.gem 99328 BLAKE2B 1ed8d9688a78ee30f3f7b7a71317cbe92b39e2a1b6f9db710a328a4b9542ffcff4be9051c5fa440bbb93c1af56742755e4b70bbff895695102c126293b7d7ad7 SHA512 dd1934e4f8aa8a97b70dbe0f1436496892a155fa188930321e776d57ec72ec34f95f2665ad5db671fdba99304e279aa8a045dbc6126ab50d8cc2d84838bc145b
 DIST mysql2-0.5.2.gem 99328 BLAKE2B 0f1a0d4657e5933e14d445ceefc6ff605a8b07bc01686dd0a67e018c45857a92d25914e4f0aae1116ed1479583636cdbca2aaeb127b856b38052264d579991bf SHA512 6013b0c862f24f0c20b22c50a17390a7a22390e661d0f1afb613177febfbf854f63aea9bc9aa8defc9521896144fbc035a8e16b135abb47384453a23dfd99566
 EBUILD mysql2-0.3.21.ebuild 878 BLAKE2B bca3c425b169f6ddeaf900476c2c8ad1dfa1c6faebeace43dc69765c5668d52ca9fa2efcd09d0fab2abbe679d7a59c9db8180226476fe9abc065a54a83180ba8 SHA512 44b798edf111cf335bcb7a489f8c854392c07fdd3ea3e96b7cb81bc6f00489a785a40833edbdea2ba8d0cfad6389211e0d1e5131ff58260f17c629530a62ef11
-EBUILD mysql2-0.4.10-r1.ebuild 1104 BLAKE2B 55d46ff7b0a94d0553f618015d31a4ea640150fd6c7166858edd261e9a3a9f84eb308f0f7004db5658a4f83a090374643fb3077dd6a7209175cd244fe3ed5856 SHA512 a9d322091cfe2ff701f51b0c2b43a8e41de8411956bf19ac55be49ced9b744668f17c83ecef8196174781c63467ea03b3212d22ae9e21239a337a779fc26df4c
+EBUILD mysql2-0.4.10-r1.ebuild 1109 BLAKE2B 4edfafe248a1812e411ca751ed53eef968a95fffa4e1a57564d0c2196932e042ad06037849a4b58bc686dc7ea06b27122e1d865648fda7016d08c0e4e25829ac SHA512 5b8ce65af849ea4d16577ccef0a7fad6e012e03038badf7548cb2eab0d45e77d2f423fe8b62f26866412a403553e91fa9666d6b0ec4d15295725137bd7a1f5cb
 EBUILD mysql2-0.4.10.ebuild 871 BLAKE2B 80eaa8d0541ab2ab4a2483e8779eb0ae3d6b9929be09b64f389d51dbaf13f2b98301dec8e41cec48d26c0a06375d2e1592c848cd57b252ad5351166b48228200 SHA512 f385ef153b9c0cef750687eb9bd772c0044c88cf85c60f359dbabfeec9b92be59c60503b9acb0d76e86efc25e878dbb5815ed1648fec9f44a5d9b1ca304fec4c
 EBUILD mysql2-0.5.1.ebuild 871 BLAKE2B b99de7c0d899f18b2e830d87ea5d77c87f02b2e426991d127bb56fd7b60ebb1b8446cc15c4c0ca72c7e5da93a51f3b073f766756cb49ea886af99a9c6e19b8f9 SHA512 a193c8d5e8895e75ee5a57ba55a11cd8d6d30aec0982c22ed593202e3bee9d6110b49be900a53787442f22e5df5b4c9ecf0c3515c29427df983aefea40f42cc5
-EBUILD mysql2-0.5.2-r1.ebuild 1106 BLAKE2B 0ddae463bbebec7f657143730351a171215dc2d79eb95d7fb6ae06d9f5909ef56f1ab068b6eda8796619c9201d1c9081fdfb08bd9451f56c43441ba05b2a8088 SHA512 3a162d11cc6711db46aac18cc4c61cb56a00b7577fa01f609d173da2575867e67f63fcd80105c9dda48ed013f3ffcd1990c36ca7bb58fc3338403863a307d2b2
+EBUILD mysql2-0.5.2-r1.ebuild 1111 BLAKE2B 7d41638c5bedf5dc8f691d4d7bc5261e88a6164805f7624bee3c3ea4c906941ea314d1e9d0d6b490ee2faf7797e580a9b2b5b8fad1ece7488dfe3a7aca34bf57 SHA512 95531b4f52ab8097d7293f5a66f911256bd9adc36028a2371aa02ca98ae6f571e73e73ee930cc6045d9e168372f07d98c1c452c4fbeb92d9458630867beb8892
 EBUILD mysql2-0.5.2.ebuild 864 BLAKE2B 0b11d1fbbf05babce69c0b7ffbaa363a97b8e5961c844de072cb83185b3824e51ce78a2adfe003e9cbd5563d151839ea428f60b2eee80636897051a297b45123 SHA512 c03098a3bcd4b9a73a45ddfb922af6caac8535bb6430091db5cfe2100e4f4a1c0af6e0e4c3979ddbc885f5c9e7c50c0aa9f54b7aaab24defe86bd3f731ef1413
 MISC metadata.xml 413 BLAKE2B 1fdeec661490aaea22676fa4af618fd6458c8bf67c61ea0233f1c68629e89cfdb5f8c29572b9d75c4dc010b1a774b0c703fb6ef4cce1e3e1649452ac0e0aac75 SHA512 1e2e76b14e8c3b44693f0a1d9f83d8b1c95f4eb65490c914fc925fafcfda58fab2764c8b54a87a8e347d53ddb8ce9ce6ca2a08564c97bddae0d0cba0719dfb73
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
index b8a1d8aabe2d..bce3c4b3578d 100644
--- a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 
 LICENSE="MIT"
 SLOT="0.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="mysql mariadb"
 REQUIRED_USE="^^ ( mariadb mysql )"
 
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
index 19aef24fd2cf..b2eebc52d058 100644
--- a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 
 LICENSE="MIT"
 SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="mysql mariadb"
 REQUIRED_USE="^^ ( mariadb mysql )"
 
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index fe8a824b6d5a..9e445c47752f 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1,5 +1,3 @@
-DIST neovim-0.5.1.gem 47104 BLAKE2B 030448fb6df7d88dcb6440d9856f373c8e553c98c4ef769f18b517be6e104e35b78fb0bf1dd2e3aba8201367d2b89ea17105bbf84d31c1ee72632b7efb5ae894 SHA512 2c54292c426364e082e785eabd4046997db3e63e0679c29be60d58d3bec1a646afa6dd2eec764e2941d8214a62e9c9045a19ddb7df6fd6e5146f5bce091f8a79
 DIST neovim-0.7.1.gem 40960 BLAKE2B 9f23c0f754c696b28679c839132c8fe4d9d7095249966187c1d378cd89b5468ae98349e7ef044a9ae3749443a0cb97206f1fed3617192afea31680a86b3124b7 SHA512 075de15135ab11f268211a2db90766d1de9e7581d945513c0fe2a1abb4f9dcba1f5814b62e91f2a615015eeb1dbd54ffa0f4edd0acd71ea635046963074ad32a
-EBUILD neovim-ruby-client-0.5.1.ebuild 415 BLAKE2B fe365d92f3aa79be886c0028be6ba2e343000d7e5940724984b214723a344b472984851ca2f08cdb371268d45e8ebed40486dfeca76e7095a03818d8b922ff31 SHA512 f7049e4134eb600ecaeab26f9ce9081a985a52ae1b1d188c8376fa558ec197ba9a5b2f9895ce7103bc27d0753b698f27e0a9ae7d9546a464d2bca6f9a0385960
 EBUILD neovim-ruby-client-0.7.1.ebuild 469 BLAKE2B f8e36f50987b838334e5606d6dbe8f86a29aac927faf95f596a901415a5d3df6e4be433c2b99a61269bd58832da3f702caa9e385d6b0d4a83a93e4cf00ed6bb8 SHA512 0c2c73c733f5724656789bf9401c21490c798a32652807d030e1c2216ab5b91164006a52f80db446175f47f3c8633e92c6360d49a0280d3c4270e2ea41261b3c
 MISC metadata.xml 341 BLAKE2B e831cdd85d453c008c3fb9f12ff975c1c98cc6e31c7deb25dc163a3dc303bf845a68a69190e880717dde026ec5ebab55b8edcd33b01e1a59ce92e763cc97a744 SHA512 22a5dd69b6c2721c1e70106904f9a8184c593f166053b04abe2ac1c2619c624e5372e0a641214eb1c5ec8f961e3ca8a56eb51229d1ad1c127c9d9e645accba79
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.5.1.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.5.1.ebuild
deleted file mode 100644
index c5f51a01e7f4..000000000000
--- a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_NAME="neovim"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for Neovim"
-HOMEPAGE="https://github.com/alexgenco/neovim-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend ">=dev-ruby/msgpack-1.0.0"
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index c77091fb07d8..0ffd63ec1bd1 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,7 +1,5 @@
-DIST psych-2.2.4.tar.gz 133451 BLAKE2B 665a234b88ff9b5f2dcd6ddc0fb249e2af6a2594b1e3817e68fa47d58556f211568b61d416be3afc91a1cd40237530bd0751d52d49a63ccccf2ff196d7ec4faf SHA512 f56b0e68ba2c6884eaf645f4784dfe56667b8527def29bcd2a36e9f47e11acbdd4a0bb7025988b28cca1413f9f15524ef9fbe61efef3ff295cce4733d3143894
 DIST psych-3.0.3.tar.gz 133778 BLAKE2B c28ba4ca2fa8b042bd8f13294330c7704401d861ff082fc2b97c59b7f5ab29001a44184992eadd78fa125ec14ca71c9e79c5e71bafe46471643ed0fd62180165 SHA512 cc2289dcdcaa7f812d03580bd05894fb66c7c3c161535c8f17f790a6a9c35c5623462102276f63c54b884a82d86359b3e0f455b2427db3b6987ac5d71010c8b4
 DIST psych-3.1.0.tar.gz 137194 BLAKE2B ab2678d44ee0824ac64cffd03f7d3e204c1c097c27f6aefe5701f663fc4e6f8adfc898f3c666c1485e6719b2902d284e8191c72cc4b35cec0982e31188b3319b SHA512 c2919840462502bca6c1619409005f3904816048caa08f9637ff6e306542afc566bb3f873e615581d9d6fcb6ace8a30c080a21523714c18d8e639d70026ed153
-EBUILD psych-2.2.4.ebuild 1081 BLAKE2B bb889cc8ceb1de707295b79d0c021486bdaa7aad0b3d5dfabb5162f9634a15e6e3cffd4ba670c035a9ee89c3806b35a8f2ec29b6930d562c92640a1a27c849d7 SHA512 f2047f58babbf1893647c28b1a8346f7f3c4b61c229206714aa5185817439766f192c54bddb82b6d14767dc1a0542cc879478c6e3b2abd63f3bca99f99a59b1b
 EBUILD psych-3.0.3.ebuild 1010 BLAKE2B 0100f53670d57576e83870ca2a72bad6ab38bccdda369ad9b7b0b9d7b56e03946c06106ce50dafa9a91c352131310de55e9c36b597ce9ea9c8b15f203d8a6372 SHA512 8f8ad8c37bc5fb1f083aebbd8a190b7c03f2a00950df394ed458313524fdd76856e42556e482ecea413a899eb5c0defdfb327c08c3b6c62fc87bb951fab5fb05
 EBUILD psych-3.1.0.ebuild 1135 BLAKE2B 5f78c0e89ccd99c1fc24ce3a2bd6bddb6c6b1c22f96a2fa15ac4e477ae413373d1767d497a2412cdb224148d40e86df88c3f23fb989f1030d06584ddd88b3b8b SHA512 10f82d20b7a4cc2e60195a837bb4311b4ee9d31736fcc430711e6f9b18dcc5d5458bfce161b7601edaaa7c26deb1a83218a92f47d3e0471672cb7bed45c3af2b
 MISC metadata.xml 342 BLAKE2B 0ef324da844625ecd5d24a84a61f2845b689deec699669df0fbb6ce980509c10b1597047f917577cdca9121892ceb30fdd777fd2c66892e16ef41bf011b2cf3c SHA512 d1246a904cc4a3185ba2d91dcc6be5230461555cb57d71f1715c163caf5f8954937cbf58ddd71647a0662b65e59e917dc2dcf59d2ce92e9d8e600a3818422ca0
diff --git a/dev-ruby/psych/psych-2.2.4.ebuild b/dev-ruby/psych/psych-2.2.4.ebuild
deleted file mode 100644
index 6af8a0ce4038..000000000000
--- a/dev-ruby/psych/psych-2.2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A libyaml wrapper for Ruby"
-HOMEPAGE="https://github.com/tenderlove/psych"
-SRC_URI="https://github.com/tenderlove/psych/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libyaml-0.1.7"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~>5.0"' test/psych/helper.rb || die
-	sed -i -e '/s.files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:test/${PN}:. -e "Dir['test/psych/**/test_*.rb'].each {|f| require f}" || die
-}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index f4a4d6d70917..a6dd6a61ae53 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,9 +1,5 @@
-DIST rack-cache-1.7.1.tar.gz 260613 BLAKE2B fac2f4a476531a3c89e2917e039b3bd27d6b4486b396cfe1de12894bfc1cb2fa7e1739d45b92152e05be243ff1010636260f66b06cc2055ea09c2140ee857d40 SHA512 a4045483b0e10054f8e2dafddb45f72f3d06acde1df9f14ab51f72bbbf16b8e587b3fdb1f0d18a358fd5a46fb7babaa3d4f2b49d26ea1efbaca32cc62d2b19ff
-DIST rack-cache-1.7.2.tar.gz 260666 BLAKE2B dc1f8bc7025f596d40d481d52168964b03610a89c5226967ba0d3d67ec4a116d91df0ce679361e4a15bc41c459e65879a4c2c24c7fb1a9b3183f5b9b705ec3e1 SHA512 67a39f2ebc7afc0159b60b2aaf252c4bc47233adf41244fd5e3587e61df6106710040d4940f162d78e3479fb1616de17dbf9bce36bf2f71b2eea65d6c159b862
 DIST rack-cache-1.8.0.tar.gz 260732 BLAKE2B 79104b2dd82ec1a95abbe84a97e8a7cea918f87e3845816d6252610ed24e82c4bb38fa7dc34ddea9517af06d21091c23b5316ce87a9f80d49fcd3be1a7764b22 SHA512 b5235c0b3d2a3476555bb2420bc5d69ae12d8d650fb9ea1d8d8fd4f1dff0c45f47e920c58c1e44d1e565eb45248d4e63e7643c8c50d43706365a36ae80f2eec8
 DIST rack-cache-1.9.0.tar.gz 260825 BLAKE2B 58f3bfbf6af9c515ef1dc7406c6b41ba8ce37c3cc9533a21f0480565fa72b72acb517a161a7d00bfd21e1e2b2379ab85796e507fe478c601c287031a70858bff SHA512 da998796a26338af2a484a8bb87f152706f33de719cc546f7bd4c4222ca5c52297d0b4dbe233e4362d6b5e6fedb7b527ce9a29cc03a6fbeee12e760afc070a93
-EBUILD rack-cache-1.7.1.ebuild 1138 BLAKE2B 5634fe41b8b81e1f5c64a4852d9fb0a43e878a9225e824a2a842888beb58a7ea05e8b1dc1bf329cecf1f70e21db3304c6462b894a9414cee41c5469a081ce006 SHA512 acd7c658c41acb55e40670b337d0ea3ee3b62e8e55ec5368479ca36631c04b7f489e23762d4d0f48eddfedc589f0029f3e6835d2bbb752e83c1512a576b4aa0d
-EBUILD rack-cache-1.7.2.ebuild 1139 BLAKE2B 80117cb99b3cdce517460d7f8c6505890a778647df3bd4a85a2ea16b85a960a0a7299bd0c7394cf729a72ac2fe4eb60ceceeb7266ac7476632070292a4b1ba5c SHA512 247a71dcea1e426381655911498bebcdefd986960316ca75a0f5bedce56c3cc556de41a0fd93fa4cc8caac3405edd300e8fe5a9b0891866bb535ff89e956973d
 EBUILD rack-cache-1.8.0.ebuild 1130 BLAKE2B cdb507906e061ee52a3b6c5402aaa5a835becdb45021c2e57fb783d297f9da535c928e0c2a63b42a519b585c5b81dd745f84dff39ca46e086fe6e6d334c499e1 SHA512 cf9cbd1e45689dbcd91b1278d64b34d55062da906afd401d1a302d3d477a95ede6686290417b43feba7cc057fe23c684dc1d6dcc74fd3fd54a8fb4c7aca4bb0a
-EBUILD rack-cache-1.9.0.ebuild 1131 BLAKE2B da35c744ea6cca7183266731bc107ca12306248bf9ba1a0a1f2b834783da6e905d0ef252180388d6ca34019174f4bcf4ddbeeb7c9e9dd15830613792a48c64f2 SHA512 840dba86fc38f9a0e13e33b52e7216096af3c1589c43d8c7a4be8d6f31ce4090ab355a0894d0a113bbfe205e8ea3227e7940cc149a2a4333dd054d782344a64d
+EBUILD rack-cache-1.9.0.ebuild 1130 BLAKE2B cdb507906e061ee52a3b6c5402aaa5a835becdb45021c2e57fb783d297f9da535c928e0c2a63b42a519b585c5b81dd745f84dff39ca46e086fe6e6d334c499e1 SHA512 cf9cbd1e45689dbcd91b1278d64b34d55062da906afd401d1a302d3d477a95ede6686290417b43feba7cc057fe23c684dc1d6dcc74fd3fd54a8fb4c7aca4bb0a
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
deleted file mode 100644
index 3aad907af4a8..000000000000
--- a/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
-HOMEPAGE="https://github.com/rtomayko/rack-cache"
-SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~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/rack:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/maxitest
-	>=dev-ruby/minitest-5.7.0:5
-	>=dev-ruby/mocha-0.13.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e "2i require 'timeout'" \
-		test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rack-cache/rack-cache-1.7.2.ebuild b/dev-ruby/rack-cache/rack-cache-1.7.2.ebuild
deleted file mode 100644
index 72371fb352df..000000000000
--- a/dev-ruby/rack-cache/rack-cache-1.7.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
-HOMEPAGE="https://github.com/rtomayko/rack-cache"
-SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~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/rack:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/maxitest
-	>=dev-ruby/minitest-5.7.0:5
-	>=dev-ruby/mocha-0.13.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e "2i require 'timeout'" \
-		test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rack-cache/rack-cache-1.9.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.9.0.ebuild
index 85b213201415..c377e43b3b2a 100644
--- a/dev-ruby/rack-cache/rack-cache-1.9.0.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.9.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 ~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/rack:*"
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 0a1ce735538e..69402edad9a4 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -6,6 +6,6 @@ DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928
 EBUILD rack-test-0.6.3.ebuild 959 BLAKE2B 97f7f0ba6f376e50991dadf70c745069b295c03e0a2f139307b089d4287e9c2419d2c0e26f22b746c102efb229df4287c35db85e8020df69f8e9e5e067047fdc SHA512 732544b35298ca4b7a5124ef0ecb55a1df59ec39a4b7a60285f31744c2005156bb26243ee17bab495bd1d5887e652295bd0e6d348e05d79f128685b7e045056e
 EBUILD rack-test-0.7.1.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
 EBUILD rack-test-0.8.3-r1.ebuild 1150 BLAKE2B a243633049097f3d7ddb3054a4fe752d3a394dd32350e53de8889fedc158de5ebbd1e9bbcf016a683a6d4636e37a71f277b59f8aff3b8da6fbf85d8fc6455c23 SHA512 4d8d31998f3c42a2c2fe64fcbc1a2c328e0f0b068b5caa75c9a736f1eb2b991fe81ad98ac49d21f09edb97ec51f58d9a78b165bbd6fa1738ee189f152b0841b0
-EBUILD rack-test-1.0.0.ebuild 1143 BLAKE2B 6c2349179b80a907b79dbc7664b3ce7490da9f4a857aaf70a25dcfcc679c702d3cb84f0b2d56d29b6f7d33abd9210dfd77fd5719c28e972495f3a65588a9ace0 SHA512 bad849eee444b4f21b42f85e5d2b8a1bd94d9d42ff1ffc9ae9fe48368f1313e52850bac164e667af57905c44d59a7fbd0dd7e3a2f49702585d5193abbe238708
+EBUILD rack-test-1.0.0.ebuild 1139 BLAKE2B 3dcd59c429b221b8a6be19e3d94cee14b4a17e160d20fb928333aba22d41a3881755e58c20ece07e47c67b5df8d79bbfed8062e146d6e8035c1f049ecdec0179 SHA512 705851287309794166304b60d138b2f6e30d37407fa03d9a645a2876562f86a10e8f88e4ab7b0fcf409e95ae242c2200cffccb9887e33845e8cedb7b5b1cdd8d
 EBUILD rack-test-1.1.0.ebuild 886 BLAKE2B 3a32e7177609b8677dc4e4701952f35b28cb51719bb2de68f707e71978199122ec2e7776f4251d957dd366f57dbed69751d7570a84e52a619e40d7cb58d3414f SHA512 b54abe324498046a693a8dd975f908c11b058863dbf93f5ccf740703ccdcd5a4995c4a372d4824cb419ed525723a9a39fec77350e5310f065a72bb392479625d
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-1.0.0.ebuild b/dev-ruby/rack-test/rack-test-1.0.0.ebuild
index 9097ac5cbdac..d15d7a3cbbde 100644
--- a/dev-ruby/rack-test/rack-test-1.0.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 ~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/rack-1.0:* <dev-ruby/rack-3:*"
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index 6d2d8905a408..225e3711b5d9 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,5 +1,5 @@
 DIST rails-html-sanitizer-1.0.3.gem 15360 BLAKE2B 375cce24dd83b56baa0fc11bc0bed9e843ac694548d103eab2daccb30fd38be19d91782c87530d47dec7ad4683a6e2433152644580a804f8ca42e0b5887f7469 SHA512 84d91014384773389492d7cde0afcdc7e3324320970788d88861f89395d847d2599d1e645177f5301109194805ffb684f591e287f3e4280117738416655d934a
 DIST rails-html-sanitizer-1.0.4.gem 15872 BLAKE2B 4408a494f75bedb4e4286e053536abf62f094873d9e0a8c21f9de6f42b2826f187c9919fb86c84380c1eff241c62f077d48cc21912c93fe85ac2b6039089a84d SHA512 f608f2b642869606fc2c3986298a8ae3e36c676a7eda5e3cce419700961bfed011f8d4a2dcb59e5d32a41f556815ca5f214ec19f8940ce71d1217ba84686b8e1
 EBUILD rails-html-sanitizer-1.0.3-r1.ebuild 1017 BLAKE2B cf2d7fae28dcb4814ce90254701205747f950ed80193b530e416f072532a49c33def70f56892401f1373bdd80b2934058dc1699c139f232a93dc862ba456b31b SHA512 41f91814936966a8d779d92ba99d71e2659f50893217d8c1991837ae65ac865337fca74c646fca6f6bfd9ad9c16f642ccbf1f2173478b4dfff75d715cba0309c
-EBUILD rails-html-sanitizer-1.0.4.ebuild 676 BLAKE2B 296e28a64e72ba0193cb5e2d2516c3b19c3f118cb87e43e543ef47288480388f09bf6a499dfca06cdd7cbbbf451caf5ecdb259d36700d5debe800de383c13d15 SHA512 acc07bb81181d07e47edc42a1e13cbf52112c79f44b741679929e5fd2361fcb4e8cbbdde526012d58c52431b3bc1b41f2933c3b4997cc8065cd9d068e5e40d55
+EBUILD rails-html-sanitizer-1.0.4.ebuild 675 BLAKE2B 3967b0ca781cbfc191e968da05029acbcb7081430dc97a08580356f98b40603e16097505d2d2bef04fbb47c559496c85b10b52835f31d4494e91f120494c7f48 SHA512 00226658f48b339b4fa94ff5c4bd1941fafd63793f05a670be4c54cec893b758278c0189985446a4d6f99a3fd099e3fdcdd79880666f839e1398d2016fbae11a
 MISC metadata.xml 359 BLAKE2B f227b45aa66e29d5ad9fe902cbd05ff8d41b6ad06ea0acbf812595b936897db899436a788fb0af5143303f0ebe6f18de1f2d265c337e57d616bdbfc7b1fdfcd5 SHA512 a7b934bec0d958559083b417dac76c3ffee71d9efa912b6bab2c2c01e6aa9acf39a46d71fff54a9b750afe6f59a8eb4b12c10b5cbee62fc5f32dab29911f4bd5
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild
index 0d58ebcc8e25..5c500c2ef61f 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/loofah-2.2.2:0"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index c5271e4698d8..b6403594a962 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,9 +1,5 @@
 DIST rake-compiler-1.0.2.tar.gz 32823 BLAKE2B 0751435c46a881b0501bcb6c4e1e29abe8a156f02aca79ccd4a6cf472ff696f8be89c4e8f860dc74e27a093a586b10c9a59e1df7b496ef3f530ab07dd84e8dcd SHA512 ef7132eff3afb29e98ce21facfd663cfe495053ca98d54b26275ee8e186c91f81f0450e52bf282bfad64e1443f6e065aefa62a30692895648a89966a8a0f0ebe
-DIST rake-compiler-1.0.5.tar.gz 33910 BLAKE2B 887cce374f25c82c2904b98ccce321054dc994eb0067dace1eb2a4212ac9abe9b5409caa7df13217c32e8f76b4b29b86cff538f0293da2e1a23a885091cc7e05 SHA512 e1d7016600d2acf0203891c52d836b85b835ddd5eff58b4b6679440d467a100f2d9ea35dc58bde0bcd03852790d439d3c8e44111a66640e85b11ae95c896e6b9
-DIST rake-compiler-1.0.6.tar.gz 33158 BLAKE2B c8a73cade0f73c3823632cc24dd7f8afeb1b739dd1ae231f1b1cca4eeb749c01ca0833b7b88ee4be879cc0cfdacf260c02cd5dfb1ccf955c753616961a63017a SHA512 cdbc335e40018caa0eb082c30044eb7fbb67ee4e7bab656035730c81761bd2badda7f77514385c1c1d0a6be14450b0bd78ce98113e62ec3a9068d66e2f0b309d
 DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
 EBUILD rake-compiler-1.0.2.ebuild 1223 BLAKE2B ad478e67dbc11a60b59fac6586611302bb638c2b6bc1a84b257de5a5998f4a2e3aed686e53f9c33ceec859685a5ae7cf1faf11123d1a764514cb6a87f19f7304 SHA512 c319bdd8c839fe97371dd862f6f0aede3d1b0d6d7e55200fbf9b7cab85628bae5e8fe52b02359b6e93d36494b2ce80fc64a0fb8885ba9edc7dfd8e9860cf7c0d
-EBUILD rake-compiler-1.0.5.ebuild 1434 BLAKE2B 82affed5d19a10b20db002add8159bc0e57dc163cf69d4935b12b54f3f2db9b04beb929bf2bd2c64a76c0d3518893407087c8fa6d494db72ff7391b95a3f44b5 SHA512 37992351307dea06cc670248d42098232c697c4f0458b23c87524497570b7f8385ec529026c6191624a2923b150b2664030accffe26f1d841ccd6c69143bd95a
-EBUILD rake-compiler-1.0.6.ebuild 1432 BLAKE2B 8ca07574fab8ac3d9bbf798a32a94ce151765de75b1b8752e42368dc3faab8a2eb10937316c2afe3c1613d10e2be603235cace9a7117e61110e60923dc08706a SHA512 fe2a4523caf30a4f5b28ceeffacc742421e4d908bd6196354a1a02d70005c453a3442352f67c54554c581affc882e0fdb960c1516b2c3449009a6de05ad85f06
 EBUILD rake-compiler-1.0.7.ebuild 1453 BLAKE2B 546d5bf5f7d776ef722752a746741c3580f73f1989b29e7ba88068d4d61393e26b46c10eaa6b7e48d368bab2a56b3e28cf7e742e99457a38b01434aed2f9d7b9 SHA512 30567a511382eac6420565cdb86d792419de56774cd0d2bee5e0a42ce92dc2d01d6fda86cbc1da8d053edab62cee75824713f7a99170f5c0220eb36dbe0e486f
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.5.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.5.ebuild
deleted file mode 100644
index 257fb1d49bbb..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby23 ruby24" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet)
-	case ${RUBY} in
-		*ruby23|*ruby24)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.6.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.6.ebuild
deleted file mode 100644
index cee9dba34d8a..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~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/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet)
-	case ${RUBY} in
-		*ruby23|*ruby24|*ruby25)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index b77f03250e77..c8f5e0c98174 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,6 +1,5 @@
 DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
 EBUILD rb-inotify-0.10.0.ebuild 992 BLAKE2B d2ad181b1526389ab4f3a0c7b9fb6dc68f923193be061c3918ffc4b432fecba0d4977b75c1fe2ee02f96713f735c84d5bc006d73605fd426a61204c0b30e3ce4 SHA512 3792974d070d958f313ade6a488cacd24f8e83890710795ae037be211766d19234b0af478ded5c3c240a30638892dd32bb66e15c73b3c120dab6e1b2732f49f0
-EBUILD rb-inotify-0.9.10-r1.ebuild 962 BLAKE2B f3af41066b3479cf6fbea4cd76a8afc60f5406bb27ab65278bdf8bce20a9baa904a20443b57c0026371e95241c1af55be887a1f9901fb0320cb4b061f5adaac9 SHA512 2548a6d1d7dc72c286fcda9bfb311a90209fbe254a97b096611b18cedbc7da2f7bd51ef6db837a16ee84b02180421a94e5b060cb62d144f7e28ed301cd1c057d
 EBUILD rb-inotify-0.9.10.ebuild 966 BLAKE2B 4659394c98f68f370bdace6336139828619748a16daa6cb503ee508040779a3816be32772d435647695692900e5999b0d005a0d726e4bf426d6e57929a3bc17a SHA512 32667f3dcdcbf6e7fdc8f890ca623a6d6be9474df27862d08d3e34323a1814753834e9595c795f2923a5bc4647d3d2ae4f7a4b55d20aa2586aa1eaa184276e24
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.10-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.10-r1.ebuild
deleted file mode 100644
index b516935037a8..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index 7d58d91f30b8..37669ff63f16 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,5 +1,5 @@
 DIST request_store-1.0.5.gem 6656 BLAKE2B 2bd96d3dd40e846e8b36cae338c1f95ec812d6121db332e60c85b4c8e043fe81229e9e2f7f8f3c1ef3d7c592515bb69d5dae3cc4755f181fd29a1eb7e7c6254d SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727
 DIST request_store-1.4.1.gem 9216 BLAKE2B 06d88b26dfb1834e1a30bd17780e19db75dacfb07a18324efc06dfe17aecad6232f7d1bf7a42bf152c5350926e2d64cfcd8d86f12178d2deb0f8c2f4ea6d95c3 SHA512 83e75e866b838e79c99c60197f5fe5da106619f645d9f244c55e1f1ca4bfa82f0bd67d6f10f74be857b8a359484799d44ec9c4f0b926bba2e2699de231360537
-EBUILD request_store-1.0.5.ebuild 473 BLAKE2B 62fa2961842b571f65ad6e45566255eb9a87cc912fc8a6c8456caabe7f255ed0a08e434c0a6264701e9637db4821775d61bc6d63d53e8cfc43191c5e509d4cb5 SHA512 1dc521601da8da2b5a9892390cf7498db5434cc05b9286ef4bff608bd42dd07a5831d18f983a28487bac49b183b5625b2adfea3c6d7c558d2aad98a0742b8d59
+EBUILD request_store-1.0.5.ebuild 463 BLAKE2B 7df54319509ab1e2755c57463586a436ee94308ec8232d23e8e8b887b61bab3dca3a0320c85936eb1ba45f72a476dfd2c0649faae4883a400db1b78d64c1da8e SHA512 940b617a4dce693da882ab943c1a48cbe0147d6a44967241ca6f2ecfeb25e6918ab71c333467a45aa2e8564ff309bdfd9353470b9262aa4425c0d947ef169fcc
 EBUILD request_store-1.4.1.ebuild 514 BLAKE2B 5e8af7b54455b5f3953db04caa84e653d3cd48267545a0d596e8f35f6691d8bdff5f715c77c7c34295aca6349cf66eb7399a25078a0ad10573aadeeaca41dee0 SHA512 91bd620c6883f99d3ba84250ea1c3cd52f0699da100e683671231e8d35537238d6b386a2f5b65c108e3026a8d3584b67a28bd983a8766aa4aa286837cafc2c17
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.0.5.ebuild b/dev-ruby/request_store/request_store-1.0.5.ebuild
index f307f06156d5..2a630a4ab724 100644
--- a/dev-ruby/request_store/request_store-1.0.5.ebuild
+++ b/dev-ruby/request_store/request_store-1.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
index 735fd1d2f60d..eebc419e49a6 100644
--- a/dev-ruby/rex-powershell/Manifest
+++ b/dev-ruby/rex-powershell/Manifest
@@ -1,7 +1,9 @@
 DIST rex-powershell-0.1.77.gem 28160 BLAKE2B d1fb9f6e9f66e6b55b09bdda329037ea7da135b9eaec9f1437ca374f3be5da1b5ee63f7c92d56447c88964a4c1a4bef68b2d6b64a4e507b7c2a7010f1ff09d40 SHA512 99e3a8394c580b07580f8c230f049b15fd80b02db4b940208a1086e1c3d679ab1b757fee56356d6b25a6876ccb21c50d1037b7bbadc486a7c38b10b9b81a09d3
 DIST rex-powershell-0.1.78.gem 28160 BLAKE2B 922a4a6f8605335c664fbdad7e6214bdd48dff5d648eb324f92a5f48dd62d2a0b98283f4cddd4ccb8190b78b1c1a637190a836d0d0b486c80b18e383fa49820a SHA512 db3e1cf0e10d6454fb5b5b76e346fa7f299f14e8d2399ee7f863708444bd6404984a16bc2fccedcc1f06a1eac7add63fc75c5f1d2b8c9fb5c421817e385000cc
 DIST rex-powershell-0.1.79.gem 28160 BLAKE2B 0c8deee7ff50741d7ec868f1726b2e3a705ab6d623221b15a0cba831fc0b5ab1143da9186940f73f48dfd7f448e018421a098b673ffc846c5b726128e5a533df SHA512 e7b8680b291827700f0b1eb150205ee2e6bf795029ab7fa0d2323ca345b7a73edfbd5f848dbc5b001354d1649e0c207e5b96d55e9b68b0021457b63d97e64213
+DIST rex-powershell-0.1.80.gem 28160 BLAKE2B 2af2e6c868e77bf37772c8bb31e69c4288b69315d6285b215682f2a09af6fd98f7281d4a9c70c310159ba981104ed627020f9082ade90294bb36e036dc2fde73 SHA512 ff5c8b0af774c16398fc78c434840a4e150cadca8b1f76b887fd1f59150a18d2d6c7f1b7adad5f367f3a5eac9db5448ab82abba5fcf05c30fa3fa34da14948a7
 EBUILD rex-powershell-0.1.77.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
 EBUILD rex-powershell-0.1.78.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
 EBUILD rex-powershell-0.1.79.ebuild 541 BLAKE2B dd17300f031d7784704dd2f9124fb06d3dcabb778bd86c25ab0ef1cfec0e68c0c7a7ae63c439ca8c094c6acaba53508219017253d510ec8958c58fa23a1b9c78 SHA512 677da4c5f76facadc1e2eaf4cf0e4b351f3911b83853f36736c9539b3c1e282829237bf2d90957952b5bff32493b9fb6b0fd556e63729ce26f4864e9b6113e1a
+EBUILD rex-powershell-0.1.80.ebuild 541 BLAKE2B dd17300f031d7784704dd2f9124fb06d3dcabb778bd86c25ab0ef1cfec0e68c0c7a7ae63c439ca8c094c6acaba53508219017253d510ec8958c58fa23a1b9c78 SHA512 677da4c5f76facadc1e2eaf4cf0e4b351f3911b83853f36736c9539b3c1e282829237bf2d90957952b5bff32493b9fb6b0fd556e63729ce26f4864e9b6113e1a
 MISC metadata.xml 401 BLAKE2B 9ced95a371f0f76b272ae92fdb6955e87481fe0e5054d87ead013f86a91e83573aac67611acb9da9c765b8e6970a71cc99714ce9e6b0a52d66f7da5f2a365134 SHA512 1960bdc2bd8ecd7b03969c7dc24374ea46e45a7b7218c7d5f0677aa6906e191908416919302f5d9082c35021d7be414040852c33e457eb6d8ad5030e95b4bb52
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.80.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.80.ebuild
new file mode 100644
index 000000000000..dcab5e40de58
--- /dev/null
+++ b/dev-ruby/rex-powershell/rex-powershell-0.1.80.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
+HOMEPAGE="https://rubygems.org/gems/rex-powershell"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-random_identifier
+		  dev-ruby/rex-text"
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index ab2625e4397f..e859ca5d91f3 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,7 +1,3 @@
-DIST roadie-3.2.2.tar.gz 45511 BLAKE2B 3dba057930f330a1c35c6df6b0bdd341b78dfd548e492e2e831847fe6475c4d108a15c2d3077c26b60e8b2b72b9c68d88cc2fd3394ac3a09e0d411cfd58d7888 SHA512 484133fccdb6485c00265f62c0ccd88819eb12acc6fe10233740c8b7d1418511d5b7d1cc67f222a5484205bfd7e8616c614136205e75cf85875296b37ecd603e
-DIST roadie-3.3.0.tar.gz 48893 BLAKE2B a06d0515f3019940e0fe1284feebfeefe3db7f66b906e5c146c4407cc8078400645401050252bd4830aecb478d3d1854c41e4c9a82f0a966efaa8589f8d9a933 SHA512 bd54186678497812793fba6de13099dd166d15e2900cf6013d16cc4654a6a7b5392f50024f5d4964d9481f31f0b5272a1de7831028fbe9e9200cb54d5f8f6bff
 DIST roadie-3.4.0.tar.gz 50719 BLAKE2B 7e3948e1c9c052ac72ef462a6a4452d6831d99d0134a9716adcf8cd67d261f2c330a6309e7c8a6e00c7489f62cd2b7253f4db48f7daadee4bf57fb1c40cd181c SHA512 cc25986dbe054b18189dad46f2dbde4f325c7391f5cb8ba598f504a465b99cb84339b2fdad3ef663d50275a186620dd60753df3fccfd5bcada52b74ee4c7c55e
-EBUILD roadie-3.2.2.ebuild 931 BLAKE2B 1a65f743830b35ff2746d75c3bc7494241372399ab25c329c5ad76f52493e98283b016684dccf90af185c262b873c010c920613842d14b8b703ba0ebd9897f02 SHA512 dfcce45cc2eea219c48807028faf99d241cfd050f1fe064e418f9c89097e71fe2982341325313e5713244af29a581793ac8734f1bb86f75d3b7dcd25932250d9
-EBUILD roadie-3.3.0.ebuild 931 BLAKE2B 1a65f743830b35ff2746d75c3bc7494241372399ab25c329c5ad76f52493e98283b016684dccf90af185c262b873c010c920613842d14b8b703ba0ebd9897f02 SHA512 dfcce45cc2eea219c48807028faf99d241cfd050f1fe064e418f9c89097e71fe2982341325313e5713244af29a581793ac8734f1bb86f75d3b7dcd25932250d9
 EBUILD roadie-3.4.0.ebuild 931 BLAKE2B 22ad24dd939bf3eb19d9eb3c09d6d68af6adb988b589a8230de6ecadb13e115ba2872b91cda5cdfacff5ed1b98072c7b5c7111cfb648e19ebcddc2d767bde4f7 SHA512 70ad01a6cbae4a448f943e97dce4b6035820b9e7af3e1690ae69119688296c4e1b3dcf091c0e1aaf99d4ca5fe571299f7b39468a80471626cfb6deabf85b6abb
 MISC metadata.xml 328 BLAKE2B 1259d1fa19fc2a8d67f47d7ab4a409758d735839a384b75fb9807a1350e1dff6caa79e19063dd0955616b15a12f25040db50d2ffcfc4fdf038375032ba9b8a4e SHA512 56c3c637b8500939fa5b0c54fcb7382a666bd3d661baae8074dc1a11281aa149ed6911d19831ec62c311917bef30d10498c9c4323866cec6c0f9f267a5608ae2
diff --git a/dev-ruby/roadie/roadie-3.2.2.ebuild b/dev-ruby/roadie/roadie-3.2.2.ebuild
deleted file mode 100644
index b9901f6690a6..000000000000
--- a/dev-ruby/roadie/roadie-3.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find . -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/roadie/roadie-3.3.0.ebuild b/dev-ruby/roadie/roadie-3.3.0.ebuild
deleted file mode 100644
index b9901f6690a6..000000000000
--- a/dev-ruby/roadie/roadie-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find . -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 670d7d999ca7..92d6138fcc7e 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,10 +1,7 @@
 DIST rouge-1.11.1.tar.gz 491281 BLAKE2B dbdc4c874f1f8fb03fc8f5c368539ea218fb4f7de36e73718bef5f657509990a634a3520d0c689db85de5f7bda6f7ae79103b2e8a1e44f6314c2253491fbd8cc SHA512 0419c4c1ca4fa4acc250349d9fd72164c7f293facc31588e5cffb533f3d321787cd3cc50acd7bfd13037d1ba77ee2f91ec37ddaeeb80180f6958f05d52181f56
-DIST rouge-2.2.0.gem 271872 BLAKE2B 19908066b3e83b27af595e49d23eff381b2a551105dcab0576be9d1327b2a182da12c327b64a27207d9c458eca69ae451bd92f4b6ea5bf98dfcf1d2052314811 SHA512 5e2eedd1a35fff7dfb241d8d47d767ceb8f58c024c852830a97313dbec099ecc21e22ef20a167f48eadae351c113a69276cf6a02b9572225a06884dac438ce86
-DIST rouge-2.2.1.gem 281088 BLAKE2B 03b9ee015e3e9aa6af1572a2dd85d999e89913c0406c8d81a09df87bb24b535abdc10d7d96d6ef135fee54b592f6fefed5b32f4e7fb08fefc7c56a0833fc94a8 SHA512 98cfa6dd85fad2272374798d49922f2e4759a416f4d0aa9ac26593160a3eb6754f689fd03930b7e1276b239b839ddaf660b064c942102af323ede32862e23b73
 DIST rouge-3.1.1.gem 282624 BLAKE2B 07074cda2634330fe26bedc370c85967f892fa239160f594ef57cb2d577812b025eda066e703b165ff72b491f718b0046afeeae7a9377ccef0315939193d1485 SHA512 3132dd891e66bbf557953bb7d0ab95be6d6978b75b37ba1ba50f2471aee1666d4228c253dbedd4a12fab6b584bba85d2327d6437788f0a9001248d9a4be1bf7c
-EBUILD rouge-1.11.1-r1.ebuild 753 BLAKE2B 21ee8e84feb445d3e4c8de4487b5993504e46267f5dbf0b5ef11d135eb83e3a337c4d8e6de085e21c85641b940cdbf3f23165684afe15267f751597428f13d9f SHA512 d90113f0c313116a9ca61c0b25f55d4538eebc7aac4142798ebc83ddfa08e5d76c6e62139bec62ce0d908d319c2aa6a7940d06a38c65b7d212dd74be035cdbd7
+DIST rouge-3.3.0.gem 331776 BLAKE2B c258479642d0f89f7aa0ec6366525b43e899056cdc374b2cdaef4949968eff664ba6dd9ff07f33cf9606ba1f759288e665104bfe3b5bca3446f35ec56cb506b6 SHA512 b4d043d1df7c286f7a81c85c770144da3acab946c3c53570f3d530dba9414023641c52a8ee338abddfd178e2037e7390e61f344fa4d88a690e184f180a4da35c
 EBUILD rouge-1.11.1-r2.ebuild 744 BLAKE2B 61a929c20ed0a4386aaee1baa071277b72b5bdc22dcb8b4e278e5fba31abef62a64c21dffde27676c328973d5e381bf065456440069b37c1eb23f7c950c66c5e SHA512 d13003b5f6f0cb862f0efb37c367e6fc3d530a02f633016c717a2ad80b8d17e9ff8ae4f9a0128a8b57456966060c686de0772361edad019761716f7affbc4907
-EBUILD rouge-2.2.0.ebuild 704 BLAKE2B d49953bd18ad27d85aba59c1e40b4978964f52409e4398f9766e9a4e735bb62e4eba66df64de911dd56c958d8b7f016111b0fa2cd0ae0b2e6fa36e634f222ab3 SHA512 a0a6b2924be8e3063e715f1d11f4baefd5b90867fa24cb1ce441b10a70a58fb467df601884c102a1042d5495f64f75666a997e87a9908429082cc1f34c574871
-EBUILD rouge-2.2.1.ebuild 704 BLAKE2B d49953bd18ad27d85aba59c1e40b4978964f52409e4398f9766e9a4e735bb62e4eba66df64de911dd56c958d8b7f016111b0fa2cd0ae0b2e6fa36e634f222ab3 SHA512 a0a6b2924be8e3063e715f1d11f4baefd5b90867fa24cb1ce441b10a70a58fb467df601884c102a1042d5495f64f75666a997e87a9908429082cc1f34c574871
 EBUILD rouge-3.1.1.ebuild 724 BLAKE2B 9b1729e60b9dea282962915ac1965df67dbd766e01f19ecf3411e960ea8a73be4c1938fd0e510f2f62b70a2e4857f075c7acb2879cfc171283d01fef8689e3d5 SHA512 aedf60ef96875687137921a431702d287dcbc383389eb5cadb180b4dbb38520794f3b0384edfca0a341f546d45809525abbf90a7d4a02211b93d4315231b0261
+EBUILD rouge-3.3.0.ebuild 724 BLAKE2B df5a4e380dee8ef4aa916012f0831ec9c1aa319164263e7e9322afb1384f7073dd6d4fbdcceca8f8376d3576fc939c6a0edc7e03d62cd71ed8b4df7808448f8d SHA512 91395c9c7c703b71711a2ae921fe8258127e92146039d11641f2bd80b3c90def36ba050b296c029319ea23292ce1f3dd4c2afc3ca8daaddac79f8ad0b52adfb8
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-1.11.1-r1.ebuild b/dev-ruby/rouge/rouge-1.11.1-r1.ebuild
deleted file mode 100644
index 4942ac144619..000000000000
--- a/dev-ruby/rouge/rouge-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
-ruby_add_rdepend "dev-ruby/redcarpet
-	!!dev-ruby/rouge:2"
-
-RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-2.2.0.ebuild b/dev-ruby/rouge/rouge-2.2.0.ebuild
deleted file mode 100644
index 68f023dd1c8a..000000000000
--- a/dev-ruby/rouge/rouge-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-#SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
-ruby_add_rdepend "dev-ruby/redcarpet
-	!!dev-ruby/rouge:0"
-
-RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-2.2.1.ebuild b/dev-ruby/rouge/rouge-3.3.0.ebuild
similarity index 76%
rename from dev-ruby/rouge/rouge-2.2.1.ebuild
rename to dev-ruby/rouge/rouge-3.3.0.ebuild
index 68f023dd1c8a..1edff6ffcae4 100644
--- a/dev-ruby/rouge/rouge-2.2.1.ebuild
+++ b/dev-ruby/rouge/rouge-3.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -21,7 +21,7 @@ IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
 ruby_add_rdepend "dev-ruby/redcarpet
-	!!dev-ruby/rouge:0"
+	!!<dev-ruby/rouge-1.11.1-r2:0"
 
 RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
+# Depends on dev-ruby/minitest-power_assert, which is not packaged yet.
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 730d83cc8b05..68179260863b 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,9 +1,5 @@
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
-DIST rspec-rails-3.8.0.tar.gz 134290 BLAKE2B 2d148a62fb92bf73728da5a18d5d8263bbd38e2036d1c47a2bdc2823ff72cc2c4a1fafee1c66d89665b21ce9b9a907a9bdaf726cafa7345b84ab49d0d3053426 SHA512 810dd372d6889847fd5d47a29d359a72fcbc4fdca5d1b35bfbe75fefc293b208ff062d88e2159783eda152a5ab1657d3a55619a9a11dd8bde5993cd807ca37da
-DIST rspec-rails-3.8.1.tar.gz 134824 BLAKE2B 3531f4dcbe143df2b15b3ba6dda42f4b41236d184a9697fe604522cd01f3e2bb4d5ba9de94ddb4f9fc71cfdbe485f3bbf11478a5d635b69e94c10c855935faae SHA512 7628ed24e3ef7c34aa047100bd956dca9b1443219332d020af65ca7f3ccb5618ec2377535e981cef23b76ed279145e1bab39f17dfed9df8b66083e4fe3e35f37
 DIST rspec-rails-3.8.2.tar.gz 135513 BLAKE2B deae49ce0ce97c78fafe910cb73a196a404711adadb896a13bb40c82ecd6f2fd28129c0267057ce739d648ffe19bdf61799512bac97e9da3be03e0f8dd43d130 SHA512 02d60a0135b4f4b52e2721f9a79363310b60acb8252d4bb44220d37dd346605a6cd3db6525d2d8d77b9471dd91888c9a3dd02e541012f39d0d47c33f38c98bbe
 EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
-EBUILD rspec-rails-3.8.0.ebuild 1426 BLAKE2B 15d65f277c53fe44b4086cd3f193ef8051903ceba8794778fe6ed225023ec69ffb1ba983975cb504403827d5e3244400d634a336bdec210dbe94480da420cbd0 SHA512 47530a113d3250174a4a4741c951189d4051894e07cdcd856ac01a7a4104faf44f80a472ba502eea3003377b9a6d70cefef9cfcad99d2a59a1fe060759383933
-EBUILD rspec-rails-3.8.1.ebuild 1424 BLAKE2B c46ad4c24da00b4bc03f1d751c21fb94e7d7c857b3068e33b87cb9ebd05b19fc3f93dd48db1365738ee7afed62aeaa1a411fb3a9320d5b859039b698906adfac SHA512 5db6b80e8c59bf607f877c894cb91ce0fd2459d6b35c7c67169cee5258bbefbcf94a39cbda6b0bbcb6b9f58850a2a1aa73c86be4413eec5454fdc4ad6ac587a9
 EBUILD rspec-rails-3.8.2.ebuild 1424 BLAKE2B 8a015c509bfb9cc1ac3e2fb95bb2576f0275714183668c3cc53fd027e8302abb1719e3afa3175647b448d75e0174cdeb5d4f73576e95b71e052176fab701dce4 SHA512 2732e4ffe8241ea6869222524c91852e4a402780dfec3ac7577a88c310d05092ab7c9847d9d485e173705b5064d7afa227a15991ce35454c9c3b6425d77d8263
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild
deleted file mode 100644
index a3f9572b0019..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.8.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.8.1.ebuild
deleted file mode 100644
index 698dfbe50f6e..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index 7912dcd704a3..6ca36470fd03 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,5 +1,5 @@
-DIST ruby-oci8-2.2.4.1.gem 325120 BLAKE2B adb8eb38a1368b0ed305c9173c9e68f60845f454c618ba54b64c95bd6f7d1f9507c38419e5c334cbebca67ce38e7d4edba1dc4778a742147ff512bf32edf4d30 SHA512 54323843ebd3f7252b6d96cd1136752172f879bb6a67842c38e3a84effae18fddb2350be2ed4257c1db5ee54bf7678a098e2b1424508d3e597778e874bcbf20f
 DIST ruby-oci8-2.2.5.1.gem 329728 BLAKE2B e235d2b252673962618d8a7840b10c62944407a08bef02a47cbd3fa091fc41404b682d9f89ff42592f16b990ff0e051d0a1b4c87409bbd2429ced488a8e67696 SHA512 e868fae291155f3fdeff2acd948fcf3e56d9dfc5ea9c60e40cc9c742a82fc924999f788b2765088d31fb680c9e192e37e6d12c6dcedd2ed1f6aeef4c8c9bfe7a
-EBUILD ruby-oci8-2.2.4.1.ebuild 981 BLAKE2B c694bdf96e4c931cd5795cb2643dea9824290ddd33663a8624dad91a88a602829e05c11eb7474b0063976f4ec26e476f8f3dd3f8a78504113730cc0e440a7e4a SHA512 fe5735116572e937e2520cbb71c9bff3a325c72f646993f5c793611ac9312944d2409c5ad156875c95f02a7b7436ba0dc8248c447034fdee16391ed8f6fa5f06
-EBUILD ruby-oci8-2.2.5.1.ebuild 975 BLAKE2B a72d26f8fd30bd5ab4afa22825cc884163c231b3f3f6e54187ebf229c8075d03a932987cb7f7facc9350d9e90c5ba75ffa6b66051c814a29b9f23065ea1acd23 SHA512 827ff368836a6dbba62dcaafdde377f4ad70a041d3ad22bd577668b9f33c31939611b7a1a370e871a4cf55e0ef1d27cb787375ac678725970472a1c136b13919
+DIST ruby-oci8-2.2.7.gem 337408 BLAKE2B e5f9d620e7df2b64643981614a3df877fd2bb9c5047e16d5aec6885259190faa437687c440c226a03bb70d4ca0a14155da4d64b442e9a532234b9cf047f7455c SHA512 03ecd7d0b94a8a8d164afec0f71c862c10d57d6d227b971384678a39e40bbf7dc14e7267c9133f3ec466fcaa5da46d78c6804d34187790cc8c23289ab9093fcd
+EBUILD ruby-oci8-2.2.5.1.ebuild 971 BLAKE2B 45e3a1e7d886732ee7f557438b8b5eee2be303ed59fc60d04eec2e39b1e41b604ed8c6a7663c4553f3a6367ae7863f043e52dc021d296fbb064be5b7b61a8516 SHA512 cf353a91cbe199df0b482dc30275064d5029f5d4c2ce257a772a750cefaaaa021f8f82fb33545836862a15f527274da65b5ce4c36b9e9f8d793b1f52282bc313
+EBUILD ruby-oci8-2.2.7.ebuild 972 BLAKE2B e3afd0220b7195ed1de0dc65eea108138f9f5a8954482a0aa681e30e1c6f6ae281c2867d91447a641874928ddf031ab3785fd2db57bcce9a1a786ad592ea7d53 SHA512 5a5b3603a7472ad5d9a5412016c907c3fb671b46126cd138f80bf2e68800c5c45e50d7eb028a0a919aae09241d24e0b9c6c570ac20c95bad2e5d74b99a2e20bd
 MISC metadata.xml 651 BLAKE2B 4ac983df534d442e63e0d6b9e664b51b2ebda1be8345721c684d683acf5a7cad953e73fc1064a7706cf43406e4439cb5f09f749a6e3efdf3face5edfae0fc61a SHA512 596959885bbdf6aa103b16ac124de1929f7d52a7df1bcbb9d28ea9442e693cf44780dcff0605d256461c70e7d2c183f5dbb930a2f9e498ed3602b3a0aa9151fc
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
index 42aa7daca187..a459c32c20db 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-db/oracle-instantclient-basic"
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
similarity index 89%
rename from dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
rename to dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
index 9427db0ba0c0..abfaaa2c4070 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit multilib ruby-fakegem
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-db/oracle-instantclient-basic"
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 91a2b039f1b4..bdc9c55aa289 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,9 +1,5 @@
 DIST ruby2ruby-2.3.2.gem 26112 BLAKE2B c6b7d84c3cdc9212972b766382f4f560ea840ea65f2d961de7b836cc67bcbf69a427c2431533d98b91b209eec8dd7ea54cb17c0c01e021c8e4289abe6211bfca SHA512 4cccbc0498ed2af8302860b5547a54b4fada04eff8158ceb9e6a8969f85ddd84dcf315e90b2308b3f5e9e685d6e2105125ca9197dd1cf26cd03179c50e460ee7
-DIST ruby2ruby-2.4.0.gem 26112 BLAKE2B 017f7b8299a5104742d6224194b65ad848bc5347cd48d710b3a81d7203faf0670564ea08eedec3cb000d574b22736cd38476dd6f1aea3c45521fa39bfa7df6de SHA512 1edeb5e90c5d33dabfdf7579d2f24f6daed8b9686ce1f7d746d96b18c23c2d4c505a4807a224536d194426fbd81e740113bba6d659bd2dbd2a84c71e04594300
-DIST ruby2ruby-2.4.1.gem 26112 BLAKE2B d7d033d80d0d82d9c6bd7b23efd3326645f2f4cfd308f30db6a38022a9648f474741403b45a9294359b8ffacd44ab82ba6dabb0e55b0edb60364440dbf572604 SHA512 5c0ee1b3738a5c4f780cea15cdc9ba679e31b9fe26f11b458a881d40b4717e9d07202f4358e9a0ec53a657b275f86ba466bf6ace8111403d35553292bee60c3c
 DIST ruby2ruby-2.4.2.gem 26624 BLAKE2B c7ad5c63829bf03cc166d42f2ae67b47790b4652b1973367881a4c242866acffabf6783cc3296ca7ea91ff3e9967f703852be6c4bcb53dfaaff0f822b50747db SHA512 ae8a34a77d48a97d29bd0ea9e2653e6189666564e971b985e7a459a562f8f03fdff4ec8775a2184cef578249aebbc8a050b57613b63d3c09b7a84aec5f727a7c
 EBUILD ruby2ruby-2.3.2.ebuild 803 BLAKE2B 7067fc7fd27224c70d505628ac8eb4480008b0ec355c6b95bade10af1db89077da52707527549b04c07a63cb225ff771816ae21a78fdf958e334d31986ad6360 SHA512 f230576f8b88ddbe7075b7ae4967d91973d73f0c9c26da9ede36780b85f90a6a3e560ff0a288b5054509bc2fdf0175b0ee5ebfa0c978bd1f807299b1e6e0522a
-EBUILD ruby2ruby-2.4.0.ebuild 844 BLAKE2B 52d078fcf23a83bbf8044c848e2640ab3736cba06eb3fd308842e620d345946d5b73a4181e23751822cc5b9654ce1fca3a8877e5845b58e46424915d3057202b SHA512 b47c71ce59d46f894da4a1c1d0bccae6e4e59ea8a1277cf355bef9099aa8211eaae197a82587299755565792e80ac6f22250d061396df2ec39d3944fa13f4ac7
-EBUILD ruby2ruby-2.4.1.ebuild 934 BLAKE2B f00cb0919bc677db3e1224cff66abd274773c449b3453ae450023aabdd39cea32dde4baaa89ed6bb09c3b186bd539f67041da929c131a8fab8f80a13d8879b42 SHA512 fc14511d0b0c382e24881f23028f272a37eb3a80108f3858078567bf77de0f6f52a98a749a853983bfa88fb12faa9d22edb8917ce143a04c0a530424e0fb47a7
 EBUILD ruby2ruby-2.4.2.ebuild 934 BLAKE2B f00cb0919bc677db3e1224cff66abd274773c449b3453ae450023aabdd39cea32dde4baaa89ed6bb09c3b186bd539f67041da929c131a8fab8f80a13d8879b42 SHA512 fc14511d0b0c382e24881f23028f272a37eb3a80108f3858078567bf77de0f6f52a98a749a853983bfa88fb12faa9d22edb8917ce143a04c0a530424e0fb47a7
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.0.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.0.ebuild
deleted file mode 100644
index 542081a3604c..000000000000
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates readable ruby from ParseTree"
-HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/sexp_processor-4.6.0:4
-	>=dev-ruby/ruby_parser-3.1:3
-	!<dev-ruby/ruby2ruby-1.3.1-r1"
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.10.0:4 )"
-
-all_ruby_prepare() {
-	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
deleted file mode 100644
index 551cac345a76..000000000000
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates readable ruby from ParseTree"
-HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/sexp_processor-4.6.0:4
-	>=dev-ruby/ruby_parser-3.1:3
-	!<dev-ruby/ruby2ruby-1.3.1-r1"
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.10.0:4 )"
-
-all_ruby_prepare() {
-	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 1ed6904cfe84..e2affc685e93 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,12 +1,6 @@
-DIST ruby_parser-3.10.1.gem 414208 BLAKE2B 22b0df7f5b7c137e6c331b13639ccd399323bcc6d439ffd8a07ac1f0b11db9abfd1d6a6a36d6c313a86a525d55742fca6050287ef88cf2829a164cb6f0b9a110 SHA512 57abb2a972020d443baa46b2866ded1bdd5a5d6d7d5649375e9bdaf0d3884dba23d152db2e50db776bccefc51e0bf1221e1eb8c3a6468bfd5b19b2e47dd16cc8
-DIST ruby_parser-3.11.0.gem 463360 BLAKE2B 6001914a0835c5f21e16eff279100335855fd833b60c7508fe66378a899af44e928afe31efb78ad1189301b1e85facba2d025c6e544a95d730f579642169eb1d SHA512 62b01b3ecbed0fbcd75a7d3515d4804dd1d8544667ad667dc36cf19cc2e380d87bb58ca56342ee4428cdf7044356cdfa2585125636a9c18ec4a460eb901baa22
-DIST ruby_parser-3.12.0.gem 463872 BLAKE2B 1dc6772a801e777a91c6019923db5d428275863a50daa96ffa3a3ab3c6d8d1617d339523917ff0b11f635cc4d41ba4e8d68ea7fac5ad3d980f4071e8c077ce0a SHA512 338bb68decb844ad08c68080a34d1d1cc4c72c8021afa93f2dcdac1d108666680e5cffa23e55ccf91ca154527e751bb80204eda1ebcc178ba797a5ad8563d4de
 DIST ruby_parser-3.13.0.gem 442880 BLAKE2B b4ebbce3aa82465d8d377825908acb5601aa2109b0cacfb861e6abbdcdd4ce5e089c1f48a174f4cda67515a935450803c70abfe0e80a3818c04c5d657c896c06 SHA512 879893ec6f82a8c9fd7bcdf670fdfc864dbe30cfe799dc3841bdab3430dd7c126f086496cda1861b2a3cc1b5585746721f81ecf053728926e000c5041c744314
 DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
 DIST ruby_parser-3.9.0.gem 411648 BLAKE2B ba5247a408c24c2ac36561ed9c26b4124a61565327247ee5dc3315a9f3e1f995fd6419c19ee8013efcc2b30fd752b3c8f6dd24011d35168f7e8cbcd224ddb909 SHA512 f609084d82caf4c33a40b64ee9df473375f00c59a34ec5b419f155a54a7fb9436ffb77ace406a01974c6c0d7b11b97447da0b3053c1fd87c66eb0406a0150312
-EBUILD ruby_parser-3.10.1.ebuild 1084 BLAKE2B 78259aa149f4c9b469ede68bddc76316ed55a09d98a3439c5a7d57b4da379ea0b5eac33894ee105bbd04c74efc7b7de1a854694be9a336b19d62d85557abfea3 SHA512 b8319def22cb90240ede21b0a9b5527d599c959c2b535f1582d76b6f9abbaf6b6724b10baacbfc78a02e777908b5296b8951f3947be02f17551d9de796fe8e14
-EBUILD ruby_parser-3.11.0.ebuild 1119 BLAKE2B f8b85bb33e78f675cba43ad165cd32cf827b75d53629637a495c9c4c0c54eb3f872b840f6b13963efa2ff354346f620a7d0de14027f21703e2416e89caab7f04 SHA512 2e2aa20b4307e1dd09abc73426789e1b79ef424e67c19f5efbc63075afb6650e201321d845f2a1901754d251ef81ae8bc62feed21dd0e4a8800558d4ae317ae5
-EBUILD ruby_parser-3.12.0.ebuild 1160 BLAKE2B 9b57882852c7467147f38c6c4cdaa3c863c4e81200ab81539c16e20d0f0b28f722297d34adcb0a694f9b263eed8b2e776e786da732663aea3e64a65b340048ce SHA512 856edcc39a2f958c04afd57aa989c0c2076f820b1b7868bb31bfca06dc11c5df997521fbd7f45d54f32c9a632b703c28d00b5cb29bfc98faa58a48902575ad87
 EBUILD ruby_parser-3.13.0.ebuild 1160 BLAKE2B 69c616e62ed81dcb196a9180e9775f491870cb9b8eab4d37b9b828340ffda7607c9919c2ff21674055bcdc30e132141eb6f8410d72c7011c64b7b183a186ac70 SHA512 e9f85589986a8cd9e082373d6c91f533f2a574bccf2063524df972145038d3ac849ade3c77cdc47d38cfaff4501d6067419e86a94e8b60f5ff49c98bd106c90d
 EBUILD ruby_parser-3.13.1.ebuild 1160 BLAKE2B 69c616e62ed81dcb196a9180e9775f491870cb9b8eab4d37b9b828340ffda7607c9919c2ff21674055bcdc30e132141eb6f8410d72c7011c64b7b183a186ac70 SHA512 e9f85589986a8cd9e082373d6c91f533f2a574bccf2063524df972145038d3ac849ade3c77cdc47d38cfaff4501d6067419e86a94e8b60f5ff49c98bd106c90d
 EBUILD ruby_parser-3.9.0.ebuild 1080 BLAKE2B c5fd16c860245dcfdf71e00c3ae3e26c577444eefbf58c30607e5a6c53ad9d1a7fcc457a039463172bb26dfc9ba6cf9918dd7de582b6baaa11243b53b48a795f SHA512 7a0e378e6c76fa2f33c31000722490d28912f8153972442156ee48a821f2e20703edb3a1fc5f648da8d200e80106fae8b5001f158a74a65cf15796c464541084
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.10.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.10.1.ebuild
deleted file mode 100644
index cf010a3f4d3c..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild
deleted file mode 100644
index fbea3e303693..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.10.1:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.12.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.12.0.ebuild
deleted file mode 100644
index 2d80c363b30b..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.10.1:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 1e8179d3a0f1..a09590e591ef 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,11 +1,5 @@
-DIST sexp_processor-4.10.0.gem 54272 BLAKE2B 1e02525dc989fcdf09b502230b145b38ee2771f41b05a37ba96d177a67fb04843397cefd62affdb4fc447f43943f6c9b0b763c3e21790d96c1bad5d3e4d1f5d4 SHA512 6ab067d921b8ad9f88fd35b942f0c28c3d8d1ac17cc85e73774c97cd4cdd5f91dcfb9392ef0337a7b3ffcd8dda8892f0d71c9323d45f453819848aed52965019
-DIST sexp_processor-4.10.1.gem 54272 BLAKE2B 6798a884367862f684cf315f6583b50188bb094e0f67baa80250f1a69b2c12283515a2caec2ef3fc9e06ce565fb5e0ce1375abf0a4edf17187deac9b443b7b8a SHA512 6f51fd4d856f65fc84c4b4307adb432829a115dfdf62d44fa6aa3127bbc3da37f3361f3716c9de60c6bd47ae38414ffe2ec3aa921bed26d465ef8de498c18935
-DIST sexp_processor-4.11.0.gem 54784 BLAKE2B 66464fe3359cafccf0d7ec455817cba3f13d02660ef1f60e5a246b29588200c7ac9b333488751015e81f639a5775ab6c9c7d96fff91310ad7b331c6782aed381 SHA512 43d050333b37af045598a5d171b5a37674fd6155365b7bc3834834175d5453addf7c1950eaf0273bb42875070351870a7558c58c09c9a2b64ec0faa13e6945ed
 DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
 DIST sexp_processor-4.9.0.gem 40448 BLAKE2B 327298cf76d9acf3229f80965e6cd626a36b3585afc847c4f4164780d93710e089fce09f4d453baaa8e8d99fc30249c40ccd825058d971176e26cc6edc296b3a SHA512 f73b71fa436b73db3adb590f3273904474f2a8575377c0ea9184c2dbe8068b3c673f74657e949666fc04d2028efc22f81c14488a5484c66e2b6810afdbbcc531
-EBUILD sexp_processor-4.10.0.ebuild 763 BLAKE2B fdc4728069f684d9a25be521f97ba4df1600da9750debb5ac60fa8893630fc5c70565fbe5ca26cf92afbc9db4eebed5f5e75205dade1732596b227bbc63e293a SHA512 a4a9209549ab236eed76c190ebcf628bbeea28e72aa9f6cff493bae1b20c5193b347290e8b7b681ccc051ee416811ed8b9b64082a39f8b06347f08026d7bb05b
-EBUILD sexp_processor-4.10.1.ebuild 765 BLAKE2B f7447994f783d6c026cd516cb1e2e1531e4e8e0e4271306bad86bed0107d3c96de0686c2ced31f850936266779b203194f4d84678405ba1edc63f0bff1b75274 SHA512 afe68c10b81406e66bd8730f588112323263f0fd7fde3dd058623a165a1a8e16778c1484e17c1f37dd2b7312d6f4bbd8fe9e4addfa197f97dae410b6d7047463
-EBUILD sexp_processor-4.11.0.ebuild 808 BLAKE2B 671eae5e186afdfc3617cb169596457e11060a87dd9052ef891dd94c417bcfe8382a5d6b3a720522027000931436f12e818bc81983f61a77dd1721afc306863f SHA512 32fba083fff705fe01a44d26dc1cad5a757e41df2e3766581dadafa9e5e22cb50debe1865630ce9964bc2c298a1034ed912a0b1c2e951811b531c70a03eb8c72
 EBUILD sexp_processor-4.12.0.ebuild 808 BLAKE2B 671eae5e186afdfc3617cb169596457e11060a87dd9052ef891dd94c417bcfe8382a5d6b3a720522027000931436f12e818bc81983f61a77dd1721afc306863f SHA512 32fba083fff705fe01a44d26dc1cad5a757e41df2e3766581dadafa9e5e22cb50debe1865630ce9964bc2c298a1034ed912a0b1c2e951811b531c70a03eb8c72
 EBUILD sexp_processor-4.9.0.ebuild 759 BLAKE2B 68b9dc146966ec712f2586937756eac3564055c51f421712f290778bad5aa8f7b3fb08350e1fdbf95f72f412a5c94ca4a7a750c6b4323a9a44da80acdb243e16 SHA512 ff5ea8d9b8e4420c4536f9c33af2e3517b773e94a625f82d8f0734e99d4f82467d0ad565a17a9d5d834a8d021674b83aa12e57c07d557c45090db88381a69992
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild
deleted file mode 100644
index 46407e494eeb..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-3.13
-		dev-ruby/hoe-seattlerb
-		>=dev-ruby/minitest-5.5
-	)"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
deleted file mode 100644
index 7c5d88b665eb..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-3.13
-		dev-ruby/hoe-seattlerb
-		>=dev-ruby/minitest-5.5
-	)"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.11.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.11.0.ebuild
deleted file mode 100644
index 4d0bfd8bc012..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.11.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 531d24b99a40..4bafc062251a 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,7 +1,5 @@
 DIST shoulda-matchers-2.8.0.gem 153600 BLAKE2B 49ddfe686bbd80665cde74019a046564b6863bca1ae81517ef1ee8c9f91e3f5d58a5d25e7640b1a5e3cb9c99367f9bf5672f63b9632427eba91c40aa4d2bd2ef SHA512 7b40220811a11cf57cfa38457eaab612ec9f6db5b660df21bd142b3df30d3691d3b7b3b4f931eed1e186c5afe4b576eee2c86f6f8f491d46955598f1441a9027
-DIST shoulda-matchers-3.1.2.gem 208384 BLAKE2B e9ba4efad3410f07c7b28649b9ff30de66b0d57a392052ea643ee584a97c290dda6261941bdb59146a3febefba81bbf4e5a0f28bedff80643e22f800730d94cc SHA512 e24602701a0f6eaa7ed0249449401582c7dc34f186e548d0741c9e416d5c6b5bc5a9b028b677b3f2b04091c6e5373cc03c05c8e1abf9156ace15846be4064d51
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
 EBUILD shoulda-matchers-2.8.0-r1.ebuild 522 BLAKE2B ef2bbd2854cf8cd5891865b7eb97ed867fe804106b1f6c54dcebb83aae58f3b79803502fdcd042e36c007e36ce9c6d73f9dd3195c802305c42cb02303addd656 SHA512 1e39bd6760a5c9984e64a410d531c387b1990f8014d0bff5c77ac97f442d969f30eb7bedcaa7a4af128003f8fe6ec37c7bb17466e1c4c3f27e4b307cf6225409
-EBUILD shoulda-matchers-3.1.2.ebuild 525 BLAKE2B 9ad4d5592a10c74a5eaadb974ab49ffec27bb3979e158fc5b46f0469071b6bd6de0b8e701a9d4ef81dabc477cd4e738571c83584ae57516b6c95dd6f88f41b3d SHA512 f1a0417e2cb94be06d59ae5cbd68c507d974e24f65c087de78146b705a24b14d958cb05f4bc6b13e1dba49b1ed49222196d29e8f2121f849282d6eb7a8e7f521
 EBUILD shoulda-matchers-3.1.3.ebuild 529 BLAKE2B 8e86c34cb17d6cee8e2a6f139eb4337671ce57f38c0132568874c7f79d0784f4609d30684df3e4a0bed5eba750684f6de31f86be44f9369769c9a9d515cf01ed SHA512 2bac2b7f6d1bbc17aa01a98bb244212af4b90905b7a1516ae5f0e4a3a6b33f67cceb17de2064675e4711565ed6b24e1f7fca5679402723d8f795c72000c58a33
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.2.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.2.ebuild
deleted file mode 100644
index b1d518138062..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 0a79d9e34e04..e75192ca5f3e 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,7 +1,5 @@
 DIST slop-3.6.0.tgz 19570 BLAKE2B a65b4bf689d48f7a97d00a9a06a926d5cd10a62053e9ff3e64e5593eb0adf54a7f6f4a56fb6078860682bad5809922f915aeddd6b8b37b447825aed0545ede9b SHA512 48bc2f56070a6f65b865b76dd5ba2e0e434c2ac5f9efef89301833746c0d01e5d9769ae02cdff8a4cfb0ed67d4306d921eafe086f49dafa0af8521d14bcee2a6
-DIST slop-4.4.3.tgz 14763 BLAKE2B e0bfbf296b5c17fe9b8a96c3b8c579444084882cfa5cdca6a9aee8dac6e1290959b00e12078a79c64c1dd1fd2ca5282b9efae57751a1a2a1435bb3dce617724e SHA512 ef34bde9a11734b833270a7a2e5e41996c448d02ab4af37950abfd053c817d1075f0ec2fb8068642d784e2e285b9cba9d6e002f97a1a84cc7dba84a319624544
 DIST slop-4.6.2.tgz 15750 BLAKE2B a31c8ec895e534be7fe77eb09909c2210d298c1a89099080af816b9e06a5ee2358aef223b1ce0669f9d40cc91c04ce55e8ebb6d506a4bec35fb1fd9b93c0017d SHA512 352d7e5bbbe9ae4c324d1561f953fe28c1c99078bdef27f1be45453e60b34e0191e94d8952ec0a8cee7d689c6ba910616c9515747e81a8378fa825cb2139bfc7
 EBUILD slop-3.6.0.ebuild 656 BLAKE2B 627c4444d2d8c2e3a5c0157f2abdb1e0a1858f4354e6b0cf23442f81e6c0d964dc5c9e732c4a63bdebe6e062ea1beb23be2a27515c68f4175fc8de6f11760b02 SHA512 460cda11dab55d6cd58688c9b9541b89029f952a433aca7ec5bc2b44b1aace86edfcd60e6b8b00f281856a12e8b3fc3adeaf99573465a0775d7a20a3b0ac900d
-EBUILD slop-4.4.3.ebuild 638 BLAKE2B fce7884ce43ab0c83990a4a025e7ddc81aaf7c64b0f84b61e799f233cabe13cf1c3a8ed4757962d2a0b93fb405cf656883cccfd6e3e87b0dd668bff749739308 SHA512 9d9feef39f49c71454dfd5ea982d9046678157c4041a09019076ce283038dec8bbb8c21b73d821d18cb549c576875dbda16af48594cfa489141f6ce5eccf1115
 EBUILD slop-4.6.2.ebuild 635 BLAKE2B b1b4573bf58078650383164ce5823f3db2516ccd0883464f1704f055729b6c8efcd15d72a7c94f661f492fcc65380ab320adfd9a1a3e47628439bd706b21adb9 SHA512 29c726c01afd53335a23f3ddead72cf1243a52ce23597c1176d1ab9d6a9d3a679c6398cdad837cd82a90736f898e3949ab71cd0159ab1715e2db789fdf0891de
 MISC metadata.xml 337 BLAKE2B 257bf07d00a3f336c737c4135fae690b12a7b383de865d09fca95667efdfc4d66adcb55343b064c1fefa190f1f7c21c7b3f18ecde8d73e9d7632209ee8adc720 SHA512 2036c518a80c08e41ddec04f397959241a28fdbec0071c98120bbe2fade6e69ef67b1aa46191099520dced091d5aa0d16ae1484d831061c0681315cb0fa3b35a
diff --git a/dev-ruby/slop/slop-4.4.3.ebuild b/dev-ruby/slop/slop-4.4.3.ebuild
deleted file mode 100644
index 2ac06d921083..000000000000
--- a/dev-ruby/slop/slop-4.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' slop.gemspec || die
-}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 66ad3651e308..1805ac611dd8 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -5,9 +5,11 @@ DIST test-unit-3.2.8.gem 129536 BLAKE2B ee88fc653b0dc0cad7d88427391cd6a476d2d3c5
 DIST test-unit-3.2.9.gem 131584 BLAKE2B 2b6a5b8ca96c43eb3b943cf284d51bb5154409c9f10f2f9386b2e5c027f6357d38c09732aba59c84c9404ac5b185471e830ec8aa0df3cbc9392274bb1c8cd82a SHA512 1c2b127e3522f4561770b9f9e7b547a18b9f2df4120ea408a8f4064be393a26138998068c1484569f35b33cfddc8a7251e237d90703f8e1a023c14875f7e2ae5
 DIST test-unit-3.3.0.gem 132096 BLAKE2B aa569c4e7727bfd664d14662924f877d2708151832f6797818bff4efc00ce7ecf2a995bdff36f6708abba1d26cae095f192be431d7dac5d68096b34a1ad5b987 SHA512 bc07f0a3691935aa766d83ce599264e031119622bb1f3ecf9b4cbb47daa16892cb9afdc78bfd725b547ba0643c52062c4dcc606e5d187b220236ea1ea7749263
 DIST test-unit-3.3.1.gem 132096 BLAKE2B ac1220ed2dd762c1bd37b1e10dc3cb7047b6dafbd24812126f22d6fd5ce8ce5353f93048d85a45e38de031380e6b506e2e626778c925e0dad54344b53b255afc SHA512 4275346f7e4c398b0999634636b3386f054f5c7018f06ddf53b488ebeb6eee8aed7d59e84993a32163d79463601a4b65d3e4115612e0a88c654da342a548d44a
+DIST test-unit-3.3.2.gem 133120 BLAKE2B a1945604327935b784b2286c4a714561a05f2db766723cdcad47a18b3be34ff803d4a257e808d48ef650ab2cdc97b7b1e24e035e356ddb0a4f658de289a327ab SHA512 523b0902133a67949a3e88697ee8d9919bc4a1da3844acd4289ccf202b8037cc255f299b6b66d8b3c90d23d5ac4d75453c029914ec45900bb041a3fd7fbbb8c7
 EBUILD test-unit-3.2.7.ebuild 934 BLAKE2B d5df96a454145a503ae3f297d8d5e415b5df237b8f0055acbdf00ebd2c257fe0b8bde0b2d5879fe9eeb565d0282765e4059d240ae2b0998df79f1f11af9c958f SHA512 1d30f3f653d8c2222710c69fda43e137abfe422d22e883cd38c304d64b0542a36c61b757d31e360f0d5a7410d305c8c866d16f66f16b977076cafdaaaddcacc9
 EBUILD test-unit-3.2.8.ebuild 940 BLAKE2B 3a4b1607379fd7e3b994aa59eabf32685fbe26f8923419c55a9adc96847d41ddaee119157a920a3219e5dcc733af65d9172fc081e90d09190e1dd89010fa9bf3 SHA512 a0477a944bc3d03b9cc7ab8a3e540408e6e8bb828d22a033e51271d13d8ed4a34902f74bbf40ef5b8bca29eb4107301f7315bc1d28a0cb4289b4aa2b42a70438
 EBUILD test-unit-3.2.9.ebuild 944 BLAKE2B a878c5d8839d7b6a50308e3f5420bd01d2ec956232862ea4eb39a6fac60c4f81bcb3f5b4b7fd98de4e1b1b618f5b2ba5bb09448d629148f179c4d74f093ca5d3 SHA512 f2ae6099bd6c599cb1b65f95a2118b88e9c940dca0a1924e3ffebfaedec93856401ab60444ce0866655697277829786f792f1da4a5b2c998aab51d8683e736d9
 EBUILD test-unit-3.3.0.ebuild 944 BLAKE2B fa24887a35c21fc805a3f101190be1f4d3b30da8a4bf5ecd44350a63d28f7c8b81d95ab33241437eaeb7223a4a7a4c6222f8d3828ecb40d1216460e06d984434 SHA512 0ce0771892c81facd7ce37a1cb154a98d601d1fde25420d102d9235c42a4f48fe4fa9b3c10e45c860f8a0ce6f986019904746f9021a139f0b811fd75e9121a2a
 EBUILD test-unit-3.3.1.ebuild 944 BLAKE2B fa24887a35c21fc805a3f101190be1f4d3b30da8a4bf5ecd44350a63d28f7c8b81d95ab33241437eaeb7223a4a7a4c6222f8d3828ecb40d1216460e06d984434 SHA512 0ce0771892c81facd7ce37a1cb154a98d601d1fde25420d102d9235c42a4f48fe4fa9b3c10e45c860f8a0ce6f986019904746f9021a139f0b811fd75e9121a2a
+EBUILD test-unit-3.3.2.ebuild 944 BLAKE2B fa24887a35c21fc805a3f101190be1f4d3b30da8a4bf5ecd44350a63d28f7c8b81d95ab33241437eaeb7223a4a7a4c6222f8d3828ecb40d1216460e06d984434 SHA512 0ce0771892c81facd7ce37a1cb154a98d601d1fde25420d102d9235c42a4f48fe4fa9b3c10e45c860f8a0ce6f986019904746f9021a139f0b811fd75e9121a2a
 MISC metadata.xml 491 BLAKE2B 9bef2b6085dbc82d562f091ae4e136cb7aa0817369b257f77bad4aca6faba4074d4dc70134999f81ea612f70f98c072414e1a92878d349e940df8ad0811304e1 SHA512 ef28e88bb4b269eeaf05f0bb512a6cdd73750247b60c2b4ba6c5b2abdb7b2e946c07bb42e7d6416f30f864378c3fa51b86455be2d3ea4467936602d5742a66b6
diff --git a/dev-ruby/test-unit/test-unit-3.3.2.ebuild b/dev-ruby/test-unit/test-unit-3.3.2.ebuild
new file mode 100644
index 000000000000..da020d3b86e0
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 19a4fa5ecce2..76ac303c9b37 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,7 +1,5 @@
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
-DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
 DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
 EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
-EBUILD thor-0.20.0.ebuild 1437 BLAKE2B 2402abd3eb5b17bbd577f0a77df7d95b51a38e023555b0f39136cc9e3d3a0e53b80ba375a3851c4ffd037d5341f1d6606583c7339429a436df2c140ca9b6d990 SHA512 90e2e05922022ed356d7c81812cfadef0ec1fff1f0f9680edf9c039d33cdebc44128f31408df83e1eee7cd1696cfa267ec239bfd9dd0941dd16d7daeb299fda6
-EBUILD thor-0.20.3.ebuild 1434 BLAKE2B 4195ce295cb435a9c627d99a5293d4e473947650659cfe48759ada070537465bb4008faf05f77fd7f2d33acfc162f45f655fd36bd37dbd865ce6cca550bf16a6 SHA512 bed3115b8a2689a73451dc6940d4ec2044a7677d1d1b91233d191d21dc86788951f4aca1a359b505bb201185ccbeaf5b40e45ab82b69a93c918976f265d7da67
+EBUILD thor-0.20.3.ebuild 1433 BLAKE2B 44073f770cbb4fc0c927d7108829238202879e28cad4a68044d47dc50d9a01d878adc8b8425b4de004e7e07ed1b396e2e4c077ab68c36bad4b1297121dd9456b SHA512 7c564aa7b567c3030efedd3d523605dd25fd3ad043e4b4f54cb2c3b970918cab056d4fced7231e8f7a7ae1d2355903521fdffc645d3604d5cb94b4122a09d0da
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.20.0.ebuild b/dev-ruby/thor/thor-0.20.0.ebuild
deleted file mode 100644
index 60e9b5f02184..000000000000
--- a/dev-ruby/thor/thor-0.20.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-USE_RUBY="ruby22 ruby23 ruby24" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^  end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-0.20.3.ebuild b/dev-ruby/thor/thor-0.20.3.ebuild
index 1b44a1408aae..8f4a9e1875a4 100644
--- a/dev-ruby/thor/thor-0.20.3.ebuild
+++ b/dev-ruby/thor/thor-0.20.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 228119e6fc70..73f3a4a3ce25 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,8 +1,5 @@
 DIST typhoeus-0.6.9.gem 49152 BLAKE2B 0c80c76c6ed8e9e564d6fc48b259b6c1d9c5c4422d29ef356fb092dc722e96afba319e682f5548603f1bebce96aa3e616161a5e036a7c23264b98835c41955e0 SHA512 5063d3217f35db29d216327b6eed10d6613d018c496935e78aa8e2b10ec21f3372df11fe48155b45387767d5572efa93e74afb0bb9b10782d28e87dead0294a4
-DIST typhoeus-1.3.0.gem 55296 BLAKE2B 0e95dea7156713756cd7fbeddff3d1cc2530c220352e84c790886f4cf473a6b1b49565aeda6136ba2c5d40a506050438b5066f6a9c6fd5b3156f794b0c6df04b SHA512 c51458c27ff07cbde095d22e0d98c1602b2b2cb67f7e0f8f27ab931d8b3c62cd7a256f3baaefa88852f96769508e61290eb7eefceaff5f28912aef292eb56269
 DIST typhoeus-1.3.1.gem 55808 BLAKE2B e3153870bfe2d5187aa433d81a287c2f9e9e6cf3caaf52b0f542fd35e4ac812786abc389c47ab56dd4267adb5206a5ce25c5ab6cc8559fa8dfbbd6b78e53fc16 SHA512 f826cdb7e48577226b12fc2715123e13519148f67d036470e385f80f8f3112d1ad24bf580c2ed0d213242c9afc1bdf868084266d430858b2cf6de73e50a11422
 EBUILD typhoeus-0.6.9-r1.ebuild 734 BLAKE2B 958f34eb6402d828a96c3a699cb20449e1d234ae32b49204b33e656d8e69dc9529cfe6a5e8520d158385a4b246fc0bc7e6af8cbad2ea3f2394a030dc886be790 SHA512 4e3175dc69b590ac4e43d309a75350332350919710451435e2e6791b27201380ea0429bd8b68241a109807e2fd1a3deb4d81827b7d0e4472889adf832ab8e6d2
-EBUILD typhoeus-0.6.9.ebuild 730 BLAKE2B 766b748f85ded62ad0b6442a432bbee81896d7911d176ceebd23784e3b5d90b50411b8a041744b6a25e4698aabfecac20859c0e3cffc4663cb5bfa7eeccf8363 SHA512 37ae2c8ea809ccd1048753c3afa993745d0ed37a67e5d0d029f649f14cc4a5ff468fc948630b956e6e4fd3d4a9c5764ba55b60fcbd2670ed7efd4720855701cf
-EBUILD typhoeus-1.3.0.ebuild 759 BLAKE2B a172b38ce6db4242fe6b1054e6083c5babfcd932abde32a9f3a668c0283bcef4acccaec3237204a5db961b4fe072ada80a231d06c6cd8addd3fa46771fa6d9f1 SHA512 15c07b9d333da47c0392c875c1ab5c2d6e1206cfa65bf2d0091583348b560bcc393b25524a68c191eba3c964d43b5affaa322e56d639c6ab0d9605cecc78ffcd
 EBUILD typhoeus-1.3.1.ebuild 779 BLAKE2B 51819cde9c0324232ddfae9d0652ac2afc42daf882367012edb0b4b76757489076460fe97ecf593a8c4273ce1057e4211b5638c2b5e5f461db2befe8b47d55dc SHA512 b6e493bb8cdf94f9c21d57baf3ef38781864a5dae78e724416565e280501109ddf1546a1bd9116a20a43b5b9caf9ddc83efa5e8700653bdc7c7e80b57e987db7
 MISC metadata.xml 383 BLAKE2B fc06c06493e84a900ad29aa3997b8291d86a81c5b980c20f8abeb3897bbe6519bbfa5681d53df1629590e353f78aa6e0ecad3596cd6976a07302ae757f30f371 SHA512 976c74c44bb50748aedfeb7fa8a4b5f35afcc24cd962ef0441f0210f14da52121531ab23072bc8fabad9954b3bb384fbc4ae016397653b1e152434288fb9b6b3
diff --git a/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild b/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
deleted file mode 100644
index 1e745fcad561..000000000000
--- a/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="https://rubygems.org/gems/typhoeus/
-	https://github.com/typhoeus/typhoeus"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.7.1"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-1.3.0.ebuild b/dev-ruby/typhoeus/typhoeus-1.3.0.ebuild
deleted file mode 100644
index a135008d7f27..000000000000
--- a/dev-ruby/typhoeus/typhoeus-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="https://rubygems.org/gems/typhoeus/
-	https://github.com/typhoeus/typhoeus"
-
-LICENSE="Ruby"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 446c59c84359..cfff16629d1b 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -3,5 +3,5 @@ DIST vcr-2.9.3.gem 152576 BLAKE2B 130f5c5eddc2324d3c64df894fd2614fa81dc5ddfe1267
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
 EBUILD vcr-1.11.3.ebuild 616 BLAKE2B 43e01aefa94e61ac8dcbcf7a8d09a69accac5d03528de23a2d0b6b73e2f5e015da18439fe3d4ed4fb777e31a57a93fcd69f08d5d40c2abc3d6f85fa42fcd4694 SHA512 124cb0aa340da7f76522502030eb3449da6bd013d641c23b455775f2f54f58fcfa10342d4b6edabe0d522e8447d402009d0215f20ffa9e79763f1234c2876bec
 EBUILD vcr-2.9.3.ebuild 631 BLAKE2B 15bcde636a07ecc0725c6582b31896512ea37ebce07b0fe2b02fd7b30ddd9e8d2b5e9463857394eae7675a2107cc74957fd5fb0b719f5b669f0c09a491065e6f SHA512 b648d60625ce195d6e3e95b58c1becdc81cf8144148c0cb0d1f01f95b533aef22516a1eacd3b9eb5cccb83137c0d1011a87303503c218741275f58f1a9fc4b1b
-EBUILD vcr-4.0.0.ebuild 713 BLAKE2B ac3afa4b4af4a0653f536c8e58bebcd794387763c5ab7fa0e23a14a3e071757260f0142676bb94f446d50c8ac12ed82bc3dec8c4b8fa00b1582a15e171a14e02 SHA512 c14a662b9be71ff2dd84545f637f34c468d929aabbe6f03be7298a9bba8119622a9b4ee823c0f237ce804aa9c1322284d53bfac37d2dd2c8bb6971f8e246666c
+EBUILD vcr-4.0.0.ebuild 709 BLAKE2B 61c718e2388017aa3b909ead0b099bd1d2d1bf1464dedf12976091d17132cc478bff3e6611e2baae1f019ff7e6c82710dfce72004ea7165c8504c9a4bc9d5f6c SHA512 5a967fb0d89c2b9a018338fb7aa8d2ce25f6e55767c8fcd67070916727f7742febb4dadef9cd22acd7187f47e7800198fabcd3c41ffdbfa61420dff582bb7e49
 MISC metadata.xml 342 BLAKE2B 2e7bb825d3f1a6977404c0617c22057a8a0a487ce88c5cb46853b65987ac23d083bd9f1201e74a63a75e32c34862d836446a6fa2d6dd7da48cc33b7905fd18b2 SHA512 1fa01257b99e6ac0b535da28a6b30da72ee4ed4493b9b28427298216ef23a0d43417a5be745af3b10323fb86df38fc34942f0314fcf82d77b0e89e1f277a3431
diff --git a/dev-ruby/vcr/vcr-4.0.0.ebuild b/dev-ruby/vcr/vcr-4.0.0.ebuild
index c55c4a195dd5..3b7c98515ff2 100644
--- a/dev-ruby/vcr/vcr-4.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/vcr/vcr/"
 SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 2329db45e629..0a3555006ef7 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,4 +1,3 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
-EBUILD webrobots-0.1.2-r1.ebuild 955 BLAKE2B 5051e81919edf5c18fdcf5c548762c4965769cc6c7127a84521b81847a542dcf8633b2483a206daa4ec61bbdee9f5a2589fd7afba656178f0d2be501d5e07b1b SHA512 da7857ed0e66764c26dd07c87f676d382947bf362ce3f4b454ad09a2ce3f89ae4cd03137b67c2788f969625adc475ff89936401ad67ce06b67e1031c42722f21
-EBUILD webrobots-0.1.2.ebuild 941 BLAKE2B 0b2edbeb1f2db94603d5723cde9fe3ec09e48dd8e1a99360fb95edc77496d286895bd381af77a000e8b732f91eceb18a4e0e4a9ed98c240f114b6d7946c8e911 SHA512 4a2ae2b257407f23c408664aae3232d6c0dc4d819ba95c084ea94a7ea76dea18338af128c383f4ad06356b027940d619fffdcc062ca05628071acd9ca29a6878
+EBUILD webrobots-0.1.2-r1.ebuild 951 BLAKE2B 2f62f9423652326b4848ea30c8c0020ed07bebc9858662d8785790ec4992d2da209d9528b57a0a40ec283a1f96ef2be1736fa6bd3c668aad7f3266098a734d0b SHA512 4d9df70c32ee2207fce15426d8d47945b09052b1cd306b4764e6d2d1453486dca59d27848d4c6827ea6b5b6c783fa3c634d7e36a75d0fe627e8331a4357b6ba6
 MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
index 413984e979ad..1b74312b01a2 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/knu/webrobots"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
diff --git a/dev-ruby/webrobots/webrobots-0.1.2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2.ebuild
deleted file mode 100644
index d03f6eac6e84..000000000000
--- a/dev-ruby/webrobots/webrobots-0.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to help write robots.txt compliant web robots"
-HOMEPAGE="https://github.com/knu/webrobots"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
-
-	# Avoid tests for live websites requirering a network connection.
-	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0d76f02490a5..5438a1081d61 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index dcfa6401c153..b5e8fb83d1d0 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -4,4 +4,4 @@ DIST clair-2.0.6.tar.gz 5195113 BLAKE2B 6044ba36d63d74eaecad5cc48173cd56867fb300
 DIST clair-2.0.8.tar.gz 5196242 BLAKE2B 9daa91599f9fe98f9a30a043fd261882b36abde5fe985097b47b48a9630db528d978f90f6bd68b32bae9d20a92f598199054cf188b1514a42876666703937b3e SHA512 000ba7c10ca540aaba34de91cf8060f6d28b704060457d320791d188871bf10ea1a8b5eb0526ae0aeebf6b6a307b096c2cc4038ddd5f955d200d20b96f1a725b
 EBUILD clair-2.0.6.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 EBUILD clair-2.0.8.ebuild 1048 BLAKE2B b5c1bcef67e5bcf097d7ce2c4f9a1718a67291934ce94b2ad7ae28b45cf79efe23be1b2be3bb8d6ff4cd89ed3b3ee4e1decf2d721e268995604f44e8e41695c0 SHA512 51105ad82d34ade4612ea52b0d71d0413d4742a17d50244f7040099275be8b2c46823ac6884282c09de0368d1ae975f6466e99d553686da1e047f74ccc5bff96
-MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
+MISC metadata.xml 244 BLAKE2B ce0da14c65df5bf7fc2cae4430ffd0987a290bca46fa277b567e19ea1ac70833236a8979926777633066649665f2c816fbc4b602bc61d26672265436ff67fbdc SHA512 7f3452112634a3eed755c069728dbd8e6f79c52195acb4fa4a6caf7d44764e24bc37fd59daa394823b436adec9a99c932d253fafef7384cc25f0f7b3fb66fe0b
diff --git a/dev-util/clair/metadata.xml b/dev-util/clair/metadata.xml
index 01abcbc89e22..7ffa01bcb56b 100644
--- a/dev-util/clair/metadata.xml
+++ b/dev-util/clair/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">coreos/clair</remote-id>
 	</upstream>
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 11c8ad3ee642..91a02572c06a 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,3 @@
-DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
 DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
-EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
 EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
deleted file mode 100644
index dac64878d7b4..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-1.3.8 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.5.0
-	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-3:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-5.2:*
-	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 6d7a0a62cd72..ba24620791a8 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,7 +1,3 @@
-DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
-DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.0.1.ebuild 454 BLAKE2B d5416858d4e94dc2de51182c5a75159cdef7059dabecd74a86a3d2496b964e75dd885a7bded237ab6f1ca76d7b8d19c9706dfab05c8755e6981c5c9d19db468e SHA512 fdf8266a69df5bb423cdb292633952c511d2cd71f67780a29fcb2ed87d11449125fea9f42fd643f2cd3e9897e35b33af7b9bd561dc3230d72a7bf9b1b257fd77
-EBUILD cucumber-tag_expressions-1.1.0.ebuild 454 BLAKE2B d5416858d4e94dc2de51182c5a75159cdef7059dabecd74a86a3d2496b964e75dd885a7bded237ab6f1ca76d7b8d19c9706dfab05c8755e6981c5c9d19db468e SHA512 fdf8266a69df5bb423cdb292633952c511d2cd71f67780a29fcb2ed87d11449125fea9f42fd643f2cd3e9897e35b33af7b9bd561dc3230d72a7bf9b1b257fd77
 EBUILD cucumber-tag_expressions-1.1.1.ebuild 472 BLAKE2B 0522b0e68f6e894584ce7a3a0d2b81b6ed91d8c22dc6c797ef6d23d16a778b6e48e54bf70a4d2ea9aeec91fd1e366edc331189c465567bf721137f75c03ddcce SHA512 096e0c73e23134e2b07a7c1d990b49a4ae27f8792ca7ad4935e57409202ccd0b8e59cd55aabcf3a987d9955b9b9efa5ee726bab8438dc5c5216f36514bcd92e0
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
deleted file mode 100644
index 124d0a51dd93..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
deleted file mode 100644
index 124d0a51dd93..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 82e72ebf84d4..af614956cc52 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,5 @@
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
-DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.0.2-r1.ebuild 2673 BLAKE2B 718c85f7f4df14fca77c5667a0b25ba696255518a91c0fb5edb0140530f052ac9ebd419595ebb9505cb4389acb5ec872aad48e9496ba115c3a2887b8f0c49c15 SHA512 a4ec7c01e2f0ffd630763c2dafef49d9989644321fa8c4dfb30b4c906e48afe3191c4ae6babaecee4163a46f3b4fdbc474721350915077f0386982b68f3e72a0
 EBUILD cucumber-3.1.2.ebuild 2703 BLAKE2B 2c06ae7c702f4cc6d50f53c45d2d0844272c95b7bed0a026f0b8275771027d786bfd4e416abe3ebe5980b5f77e212b736a2c3838a93268d78aebe9bf34aab9d3 SHA512 dd508671e0d6c9a4fca9d551db85837c0f2ebbf7053273bb9c15fc43d768ab398193e2d1cb13c655cc061394fb7b608280378aa28b04d4940b7e97faf8650c8b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild b/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
deleted file mode 100644
index ef62db8a64fb..000000000000
--- a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.8.6:0
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.0
-	dev-util/cucumber-expressions:4.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	dev-ruby/gherkin:4
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index ba2d900535ef..ed63f541c42a 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -4,5 +4,4 @@ DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a31
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
 EBUILD debugedit-0.5.3.5-r1.ebuild 937 BLAKE2B dc741f4fc4f880fffe5775067878d47e357a904acc79bdc69d9d5d7f2f95fcd41f5de34022cf73eb396e9a0d9813ddfe5245724830b069c1cc8d80ab6d462b83 SHA512 7553d4e2fa0ca9c2d65b52636af1ee775eba337bbd7313bb63f6392dd6db140fe81eb513d64b89a4bc07b04b7d80b2f3f24be13b76001f15dff057a7f62de407
 EBUILD debugedit-4.14.2-r1.ebuild 1870 BLAKE2B e38d970fd792a15663e3d0259cb7f9843bd469766a83ffd5da7497831e1189db1898556271fd6adf857481e1cd173a89c68562949625b7abfd6377c3e2615332 SHA512 791b4bcb8f0a4de331bb448489a80c090dbc3386c314903ed9b394be36ac7dab550232f81e3d1595dfeeac728d215d0577236a5c7bf1e2ae1fad9f2079911b85
-EBUILD debugedit-4.14.2.ebuild 1722 BLAKE2B fdbdd4ca1d9b85a1bc63de6eae867bddb873ef499190e7c3626af621cb1be6ddb333ac78f03c1745113f81b09cdd62461e4d313c121a81f6396aeb0a1f2f13ac SHA512 dc3854d27602108bb7db0fb25f3155b3bf52881a2a4991ac4ef24e680c871cc7bd7c56a161dbe9e419de0f5a0ad9379eb8ce66889df49ba14111a0769dfce7ea
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2.ebuild b/dev-util/debugedit/debugedit-4.14.2.ebuild
deleted file mode 100644
index 754bbccb0cf1..000000000000
--- a/dev-util/debugedit/debugedit-4.14.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="http://www.rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	dev-libs/elfutils
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-nls
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index b1446368376f..c12b03df189d 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,7 +1,9 @@
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
 DIST drone-cli-1.0.5.tar.gz 2627659 BLAKE2B 20d2db2faab26210659811bdd8f576775856dad618348a9b1f2a7cc3c37bf07176a7d4a72ca48f7cf32be4f9359c82e7521c9f6559f7637cd75bd0d671f16f6f SHA512 292e53079b15401364396fd61de481c6c47f426335713c5eb19a9231d11841636e26ae37fd32735f54e3143247489a8ea858ed8082874cef999aae334b9a98c7
 DIST drone-cli-1.0.7.tar.gz 2719694 BLAKE2B a5032a8bde86b196e1e0a2406e8c3f4789c22809e44eb47212eb41a8d2a31c5dac26a8fe264f09d503f1f3637434f6329dfb19d44448dc3ff01447a947a033ac SHA512 1d7145854eca418d977ac4507ddc52af2ca03efed2177bef5061f4d4e2a6ce8793e867b58ec9beedcaabec973e1b7a006a4490ecc0158db7206c6dff325be040
+DIST drone-cli-1.0.8.tar.gz 2724807 BLAKE2B f8bdbd90687e59cf104d3506957616c13ddfae5e31bde0569eaa36644da40310fb24396cc49527b454478de7ef1e3cdcfa6b0b07c6b0f1b80fac9210ddd336e7 SHA512 67f7ab7c8b4d215564421470bd3894670b0b28fe8ffdcc9ed15be9081fcce380ad1ab791d463f09f441a28c17285f507b64fcd43104a369e0f8dbc39300ba91a
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
 EBUILD drone-cli-1.0.5.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 EBUILD drone-cli-1.0.7.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-1.0.8.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-1.0.8.ebuild b/dev-util/drone-cli/drone-cli-1.0.8.ebuild
new file mode 100644
index 000000000000..ca7f0b0fdc7f
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index a31e05a7f0b0..be438ca62831 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -6,4 +6,4 @@ EBUILD hadolint-1.10.2.ebuild 1137 BLAKE2B 3bdb1e21534531126433c77f9e14644d714e9
 EBUILD hadolint-1.10.4.ebuild 1137 BLAKE2B b5fb51af0ca3137c7666aab77ed9fb911f1d3aca892c0dfed7cb9039685566c90a5abf1855034e5ffa841a59320d3b570303c9d0fc80093ad0a8a702c4443cca SHA512 bf97efd4f7d4316e958a8904f372919e1e6dfb3d404074869a94d5ee22ad203705c4ef13280540639d0c078bb7aebd67b5149ce0e87e0dd9977181c82ba8bda5
 EBUILD hadolint-1.12.0.ebuild 1164 BLAKE2B dc3096d62e52a798b0371f5e0b9492f2d142ab65b267cebb6ef18d8e2f1587b227ad1bdcc82eee53fa0630165f09b48cf5038299d12fc2c6ca46156b78908f74 SHA512 8e6ed7a8e3cac87ce38312bf495bfb7382e6a01aa1e9233d7a9d61f656af92b88b29cd0fe9471c0a146f2c4fd57f3d70433d76770b07855e4b499369b4077c9f
 EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
-MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
+MISC metadata.xml 286 BLAKE2B 28047949bae509153b03e8627389845792a69fce265c8c90e9cbd14f05aae3dcf91777ef0a3e657f4c7f4ab4f26b92739fa12b313bfcf986a285e0135722079f SHA512 cfc6ff695eb5112d9be7f5cce18103ab0ba258147d98c31d7446305372bda8dc02f598e52098dbf4630189b7469427b179f71983f00b89c92c5e29bd50f2739d
diff --git a/dev-util/hadolint/metadata.xml b/dev-util/hadolint/metadata.xml
index 1eacbb097674..cc4ea93fc255 100644
--- a/dev-util/hadolint/metadata.xml
+++ b/dev-util/hadolint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A smarter Dockerfile linter that helps you build best practice Docker images.
 	</longdescription>
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
index ee696102b839..13e4c59a63af 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,5 +1,3 @@
-DIST hxtools-20121125.tar.xz 287716 BLAKE2B 66c125e4db14b6a6adb49e0d45944969f6c4a4a238d58a03a2d678eda3e5f8bec002c3fa401c1c9458b4840816a0cc3c357e9e5c8c5ed6a062309785c51ec1a7 SHA512 fa15331d8c961b0a3b1a99f592e2b4f9b0531ac294a2fef0f9a5067b5e427ca57e0c62798b1048a1d6005c9655af45136636255f684a129bc997864e8c7c4915
 DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
-EBUILD hxtools-20121125-r1.ebuild 565 BLAKE2B 62d9727f59390c97157e8685cd9be53d1883d52739bdd76a5c171fe4c3c7af3ffdef772700ec45922cc10f1b9b5d8d1eb3cfd658eaca84ea679afe484f25789b SHA512 4f886b9deb4741ce55c83ebeadadf0225444f8809fb3d07ede72e9125d4e840506a0798cce98e8bf1cad55f68673c8a8cbd57da868c71f871706b22847683f91
 EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/hxtools/hxtools-20121125-r1.ebuild b/dev-util/hxtools/hxtools-20121125-r1.ebuild
deleted file mode 100644
index 6f624335e2d0..000000000000
--- a/dev-util/hxtools/hxtools-20121125-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A collection of tools and scripts"
-HOMEPAGE="http://inai.de/projects/hxtools/"
-SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	sys-libs/libcap
-	>=sys-libs/libhx-3.12.1
-	sys-apps/pciutils
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# man2html is provided by man
-	rm -rf "${ED}"/usr/bin/man2html
-	rm -rf "${ED}"/usr/share/man/man1/man2html*
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index a6c115c15b0f..66a57ceeb329 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,6 +2,6 @@ AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
-EBUILD meson-0.49.2.ebuild 1770 BLAKE2B 7f962343f3359f5deeaec362a2138490d61dfd93c180662bbbcdecbb0ab89e957869e61eee160354063e19ab8dcd1d742c7b983f9f5fbda73744ce337ae41753 SHA512 f9a2a8a78f9a69290eee4dd74c67524a4e5d55dc5cbfee502d319dffd09800fb8fc456d02913d7c82cae966ea4dee1c516e675fb90c4a3358f19d3ae2ba6ddd0
+EBUILD meson-0.49.2.ebuild 1769 BLAKE2B bc31ea620879ccae67c59afd27272a4404653b44f3ce6dc8abff1ac76a37e2aa331bea0fca4bb914c23d176a51d4fa3c4b0a66d57b35cdd29c704ab3787dbba5 SHA512 6fcf3f68ec859dc35f2d5acf1a4bc6c4194ae35d6316bc6ab1d7692e3e34a0ff5aecef157a068f920b3769009e99fddafdbac2cff3165587bdbaefa1ae758ae2
 EBUILD meson-9999.ebuild 1711 BLAKE2B b2ab12ee5111a491c9e5278cc0cc49cd8acead98418272927c8518c58c31ce7a5754ca8092a749ba40ba35558b11fc3ceffbb8fde736aa442efc71d431e834be SHA512 e502aefc4aec2f7833e9cdc8921591ce0f2e447e029494b50f83df5be7957224ff64e53d6b6ef320b24fe84d3a5d393337098a71a6cde45d51d92504675bd6e4
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
index ac3c45d40b11..f2bd2a3d3186 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.49.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/repo/Manifest b/dev-util/repo/Manifest
index 4f640195aaf6..5ff4988b1f6a 100644
--- a/dev-util/repo/Manifest
+++ b/dev-util/repo/Manifest
@@ -1,3 +1,5 @@
 DIST repo-1.12.37.tar.gz 115098 BLAKE2B 7a54afad5a3355edfab09be62c6881b4c0d3bc521c04313bb1dd428fc7a1c9a82a65186d20fd05d67227c88d2f6a30fd70f53f35dbfc0b6e7e668252ce6fbd9d SHA512 3ff6b5c3bcc8fba1861102035b86b59137e7dcebeab7a0fb01672da28473e1912c3cbac7c085e9b8d3fce404bd18095ba022d4978d83833f666bd31d621d5953
+DIST repo-1.13.2.tar.xz 103068 BLAKE2B 055ca4ffb55aa304a466e32e84e4ed23781f5be4dc82ce854a0f2352e4b785bec55a3ea23cacd06f758ace4b5351c33cd3e32ecfa0fbb04eb5f4b45349ff7196 SHA512 acd02ded7d817c718e29e1c61dcd83b4e40380de8d3450f5b30aef47f9c1ea4872f04e83299e57999318d43a26d407bf73159394d82700a4a2b30611e5f2e2c1
 EBUILD repo-1.12.37.ebuild 801 BLAKE2B 8fe1e4ded31323b6631687429f66c5cb255255deb0271a9bd4c2bff3bf84bf25a4c691976031e7c584ca1a277d410a5a196abcd59012b7623070c4e2910aebe3 SHA512 7605c9427efcec6eec5b89165fd821ceea4a7234cf15c94187f8a890f8565e9dc1a7b3dde4836c285571cce207a3806235ac3d35c60c2c084b69ba9304b55aad
-MISC metadata.xml 298 BLAKE2B d6a6600d2ac89144cc0beeb9cbb112498edd60b5be1db49589c4507c319bb541928045a7c590d55e4062bb370cb873e78dd9c0248338bc6813fad975451ac349 SHA512 2a976cba0fab052560306f417adf370cff7c63ce747e4f291af7a4cb44836ff2af511c5cdb84414bdeb97153bfe0b99e9716d715ed7351ba2df8107e65fd1f7e
+EBUILD repo-1.13.2.ebuild 781 BLAKE2B 9d8098d5693df938b9b5d1df32fa24b9d5b6e39ff9f7641ff8890a028a613a091b892d59e9a93c7485771c8d7b96c4316b7fe6450bc23b63b504098b006ccd78 SHA512 2e472081adc2c202ad872c5c3b8e378e266a5539c936be3ad79754682c2e5c6116086c4db24df3a8324e6a0c15307acfde7ef2c8dbc26069c95eb1b04004e0f8
+MISC metadata.xml 376 BLAKE2B ca33eb393fd109516578a9dfeb59a4f4fad9a99b06496767a9ad916bea214ceb10785e625458464256f682a2a2a2d48a4e8d020f243c55d0a05dfede88fc04b7 SHA512 1d28b7903b27c5d8a97543444d4a09408023af0bd5e17ef3e824dc283173be4d8ad265948872b30e039653c8bd291588ccb13f317b3ac74941a53f50bc05b29d
diff --git a/dev-util/repo/metadata.xml b/dev-util/repo/metadata.xml
index 1a32327a03f6..26e54d13d07e 100644
--- a/dev-util/repo/metadata.xml
+++ b/dev-util/repo/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>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
   <longdescription>
   Tool for managing multiple git repositories. From Google, useful for building Android.
   </longdescription>
diff --git a/dev-util/repo/repo-1.13.2.ebuild b/dev-util/repo/repo-1.13.2.ebuild
new file mode 100644
index 000000000000..1123c98edd31
--- /dev/null
+++ b/dev-util/repo/repo-1.13.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 3.x is currently very buggy, only 2.7 actually works
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://android.googlesource.com/tools/repo"
+# Should be:
+#SRC_URI="https://android.googlesource.com/tools/repo/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~dlan/distfiles/repo-${PV}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	python_foreach_impl python_fix_shebang ./repo
+	python_foreach_impl python_doexe ./repo
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 0a333a568363..ab8ba7a2ca57 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-num/Manifest b/dev-vcs/git-num/Manifest
index 6948d3874872..7cdcfebbb92e 100644
--- a/dev-vcs/git-num/Manifest
+++ b/dev-vcs/git-num/Manifest
@@ -1,3 +1,3 @@
 DIST git-num-2.0.1.tar.gz 53833 BLAKE2B 4080bb19ad15441fff5f641576a33d7df89ece30f10c159dbc3f8a659c29568dc295f4b3f7d01aacbf13ddad3347dc705d4e9f83a07c6c3bf5e7d2ae9f07763b SHA512 f35599a74b91efb3ccb6e8509ca1c7eb7c2f67cb90b131efc6693f8f36ea97adcb01026ad307746bdf0613200646da289aa315095cbae2580c4443b03e9dd040
-EBUILD git-num-2.0.1.ebuild 944 BLAKE2B 403d12dd26269ea6b67b74558a84181059a8ac91a77ea28cc340f8c4076bb7e4fd615663a37fef13108709190c802172063f3bd8ad90f3da476586439fcbddc1 SHA512 4018ecad97900ef50864576bef709e53ce8253a859a2203e84f080665a2a307677c2a6b65e600b9fc3cf94428505609d84fa38f2224aa9e9d44797dad4caa6b4
+EBUILD git-num-2.0.1.ebuild 941 BLAKE2B 184a3509bdda32733e27d337ebda8a56767f6eaaea5c132f83458b97836d1e41832d7757635093b71a8d868cd738fee1cc1f7103185a5621708a17d03d751fb8 SHA512 e8e6b1f2f42b0937f34a727987369fb6de7099edf0e124a1b5c9a48742ebea5df501b8cdb6e093b9a10d45d4a098f21f0da1fff22014f1f93e9e5c18f20fbf1e
 MISC metadata.xml 250 BLAKE2B c7535e9e453a300c160cc23db68c3c9044cf2b4badd2506a548f85b0613df59ca4af598bed1612f5a03f120a4c540aeab35f855dc780f81a8299d366d7a4fb69 SHA512 1ac35f3998bc50445dbaf10ca62a8831d129f514433d51ffe3a92da1f10ab35013eb9960869a79804216e9818c23bb70e8a9b25d131dc23a5eb4bb958792d5d0
diff --git a/dev-vcs/git-num/git-num-2.0.1.ebuild b/dev-vcs/git-num/git-num-2.0.1.ebuild
index d3551f87af70..71e04e1ab471 100644
--- a/dev-vcs/git-num/git-num-2.0.1.ebuild
+++ b/dev-vcs/git-num/git-num-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 3ba4e48b9d80..62e8d3f52ad4 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -21,7 +21,7 @@ DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d4
 EBUILD git-2.19.2.ebuild 18952 BLAKE2B 93390621e13738ff6adcb1a2881c492a678230ac341a4063c35f8b4f159c1114baca992c553cdefea636d5f46c77d8fffc4ae4465682454aca5d62f78c2c9b74 SHA512 ec51656907ab90c63adb74afb57127e8358784a9584fca41c17299d345a3a080cf99c1d039f3779a5263a87c6f0c3cbb05f5c4861ef5931b90381aaebb5fd568
 EBUILD git-2.20.1.ebuild 18966 BLAKE2B 3a8988dc8e63f59db0b98f3c973708d55b563bb754acf6c8e9d8ee160608bca51ee4e6ce78058b405bb77342f11e15ced54e39efb82057876141dbc2c1a51282 SHA512 110619e47fde44df6d805770ca2b3ab5b280ec5db7388700d9790fbffe543002782b6da5336f9d2a7090931cc91d8a8643d5649a556169128959b98e432737bf
 EBUILD git-2.21.0-r1.ebuild 19034 BLAKE2B f129fa83dd893fa0f5c0280d46a6d6529443d02fb8a8ba0d44c43725b6e99dd9fa8d14259c91f98a0032af04f7d22170e12d31f4fa51228d3f870087b19cc366 SHA512 c23c68b9237962328b5f74c8572e50d460549bbf383d3f43b9868c6c41d7d8e54cca90b7a8d4ed6b210a74a433ff29d4b268d550dbdf0c5df56b24ca73b5bea8
-EBUILD git-2.21.0.ebuild 19011 BLAKE2B d2711b483c4d383f0517369ab5b6d1d0233d891e6c6eac39253fdcb4dcaec31b116b67b6defe7dae09ba380a96bbfae035c713b1acf6e7877347450411500969 SHA512 33e2d7655edfa1ba06836654cc2ce99b0c627929c3e760b7bbababe40fba0198c7a241ebfe861c41010c55c7ec6495ba079f49f2b8d2dc4701adca68dacd3f7d
+EBUILD git-2.21.0.ebuild 19010 BLAKE2B 0c7b8ec39eb14fd4ca578ac94cc19d155dcda17012c48d90ee3969bb9a15b7875553f77a3464be07a1c6123d8ebe3b36f9589e5381777feb538c8d1c2b487c8c SHA512 cd9898c26f0a01f9e76caa13312f9ce870db7220f55baa5da134159d1ca71fbb602da019835fcfa7d3b4c182d6950ae079e86c85ff2385d08b3262c700b54054
 EBUILD git-9999-r1.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307
 EBUILD git-9999-r2.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307
 EBUILD git-9999-r3.ebuild 19034 BLAKE2B f7cb84b8b23ed1957e0d3e41d49cfe38d49299b4ee475023f12fadd479ceaa793edb034aaf76bbd2901e3df336dc0cdef9cfdc7637e414fa383a21b3087171f2 SHA512 08c8c4bbc5bbca04948844dcb15a668c13c31a5810f11eb6318a194f808a050e9bc20c9ff4fa30f03deb762e77cedb788981fee2fcb6307b8e111b7931608307
diff --git a/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild
index e853a2ab988a..997fc19b2f6e 100644
--- a/dev-vcs/git/git-2.21.0.ebuild
+++ b/dev-vcs/git/git-2.21.0.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 58e41a2c8c5b..46ad620ae16b 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index d60597f52587..346657469378 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,4 +1,5 @@
 AUX lugaru-20151204-dir.patch 317 BLAKE2B 47b73dad97c8a853eb14d6718db18e0541607770419da6b95eb56791f5629a0ebcb1600506934aea30d3cb216c91d38fa8cf45735b0049435693a39a229c48aa SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2
+AUX lugaru-20151204-jpeg-9c.patch 362 BLAKE2B 5d3da9005dc4f9b957c36e5bb9e9b4453fd4794b5adb611f6ddd1b2f810765dd069747bc98a9df79d4a670baf919fc350902ea72bf6129f97528462173e3335c SHA512 12fea82021782563efab139a9a7e1b0d9aed9ee708e833552ec15ddcaad91a3c8fce37859d174eb86c0861717e594750d704c712cbaa9772c82c66bb13bc3e83
 DIST lugaru-20151204.tar.bz2 88950866 BLAKE2B d1d42f8d06d20d8f06fbe52d95c925fefc0453cc577dc5a023189eb77508361737ab01298f2035c3071ac7f8a239ee47c13bb8bafa852dd3b5cdecc971e9b4ed SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30
-EBUILD lugaru-20151204-r1.ebuild 1160 BLAKE2B 60510918c45226e8a4ce041b3d5ffd09eb8f0d482784e600fa33ab9f6c5a70473dc6e65a6631c31b1fafa54416756ec916063ee43570b940d6855337a9f71d64 SHA512 70613abf475f75eb59a52d3605f1e8f0cb751590ff2bcdaea7a5030d134ba54531ff70a7fe3a9a725d2a4da1377a44a722590b93a23ed74a806b6ebe7a169e79
+EBUILD lugaru-20151204-r1.ebuild 1148 BLAKE2B 8abca7c07b4586b6e701d1ea6231dbae2cf0385b59ef666f4f17208a901552d31163e6a52300111db7df1ae1d349414061902e75bcfe8ceb2bc5b87100b76b99 SHA512 0d75e8bd85fb51d33b25d9febbd7a74692e05f79d7e8faa59fd834682689693cfb222af3245da69597ba1be240f75ca6146039eb96fdc66c3c3df8cd358a747c
 MISC metadata.xml 337 BLAKE2B 5fa6d71103f9aad7af7d0766be33b63f5dcdcbba20c043a2d1183b18a23f4910d49d411defb7f1c604ef085437956af72a55fa366734be5827a3d736bc71f72f SHA512 10af1cda47d8d683fc8245f23c05243fb5809636399d75779081a3da09209829da31a8d5fa070687656e9c235e78c75f1571b5b4f1a686359a11d1232a543b5e
diff --git a/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch b/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
new file mode 100644
index 000000000000..ac0ee48f62d6
--- /dev/null
+++ b/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/652930
+
+--- a/Source/OpenGL_Windows.cpp
++++ b/Source/OpenGL_Windows.cpp
+@@ -839,7 +839,7 @@
+     (void) jpeg_read_header(&cinfo, TRUE);
+ 
+     cinfo.out_color_space = JCS_RGB;
+-    cinfo.quantize_colors = 0;
++    cinfo.quantize_colors = FALSE;
+     (void) jpeg_calc_output_dimensions(&cinfo);
+     (void) jpeg_start_decompress(&cinfo);
+ 
diff --git a/games-action/lugaru/lugaru-20151204-r1.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild
index 16843cc472c0..c2abf83066a1 100644
--- a/games-action/lugaru/lugaru-20151204-r1.ebuild
+++ b/games-action/lugaru/lugaru-20151204-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils desktop
 
@@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	media-libs/libpng:0
-	media-libs/libsdl[opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/libsdl:=[opengl,video]
+	media-libs/libvorbis:=
+	media-libs/openal:=
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl"
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-dir.patch"
+	"${FILESDIR}"/${P}-dir.patch
+	"${FILESDIR}"/${P}-jpeg-9c.patch
 )
 
 src_prepare() {
@@ -39,21 +40,17 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DLUGARU_FORCE_INTERNAL_OPENGL=False"
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DLUGARU_FORCE_INTERNAL_OPENGL=False
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
-	dobin "${WORKDIR}/${P}_build/lugaru"
+	dobin "${BUILD_DIR}"/lugaru
 	insinto /usr/share/${PN}
-	doins -r Data/
+	doins -r Data
 	newicon Source/win-res/Lugaru.png ${PN}.png
 	make_desktop_entry ${PN} Lugaru ${PN}
 }
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 2f32fdf76e52..077ea5b58bc4 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -7,5 +7,5 @@ DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d3732
 EBUILD minetest-0.4.16-r1.ebuild 3226 BLAKE2B 917e9af650a0e760804a2247b516565864390686141c67293aa38fd3ef52a0f6a68dd8713f9b6d48fb38b006c3dbcc4c2251373daf9e92bc53758a3a4dcc769d SHA512 0e5bbfc042b0951b7bd1fa589b91a280372bceaec7703046a0e124eb0c81d4572b821a72733c2ad30eed56dc7d2ff42f6d41d8e4670f1fa8551391acec3ce414
 EBUILD minetest-0.4.17-r1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
 EBUILD minetest-0.4.17.1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
-EBUILD minetest-5.0.1.ebuild 3487 BLAKE2B cb84f3a02efea3d4c18594c8e631b8a2af01e0a9b6e0de7df0e051abcc282a4a360b2ed31335850469a4252ef150f8679de5b3a6b92318de0446e09ce4281531 SHA512 e2a307e88d99ea418f567f82701880aba641cb5f4072f9e1d33a3c443cb2f34f60aac9f66ef9340696a07a98735148bb3d6f275e4a9380bda4b24ca9cfa4ed3b
+EBUILD minetest-5.0.1-r1.ebuild 3518 BLAKE2B 5fe7cdd41d77c57043a028ab548d6d2ff6baa466971330d11f603fee5071cd0d448da1c577920e335c0948cf7e4457b289b8d443ec898c52a1f012304910c616 SHA512 412facd744106ea1496c1b471056479e6ce38953efa9ad2bf0b7ed7cc2d451bdf673de9e6c83ff258ff8a46392ba21c53a07607d6684ee82992ff08db4fd51b2
 MISC metadata.xml 2216 BLAKE2B 3872d007ded87d46e806b334e3808096f7a07c64e6ae1a99a5b79db81d7396131df7ea42d7d74753efd42844e7fe01de5e02be37c8f78198de953d9e8381602d SHA512 4c2a2a007239ca5a313e31caa19483fc877e241e5ede1ea509b12931d0feef1aa72cb086266d61f3d38c11fc303f646f328b17c5f184d8bb45d0019e6a31c9a7
diff --git a/games-action/minetest/minetest-5.0.1.ebuild b/games-action/minetest/minetest-5.0.1-r1.ebuild
similarity index 93%
rename from games-action/minetest/minetest-5.0.1.ebuild
rename to games-action/minetest/minetest-5.0.1-r1.ebuild
index 32f400f26920..8147fcf53adb 100644
--- a/games-action/minetest/minetest-5.0.1.ebuild
+++ b/games-action/minetest/minetest-5.0.1-r1.ebuild
@@ -12,11 +12,12 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
 	sys-libs/zlib
 	curl? ( net-misc/curl )
 	!dedicated? (
@@ -34,7 +35,6 @@ RDEPEND="
 		)
 		truetype? ( media-libs/freetype:2 )
 	)
-	jsoncpp? ( dev-libs/jsoncpp )
 	leveldb? ( dev-libs/leveldb:= )
 	luajit? ( dev-lang/luajit:2 )
 	ncurses? ( sys-libs/ncurses:0= )
@@ -64,6 +64,9 @@ src_prepare() {
 		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
 		-e "s#@GROUP@#${PN}#g" \
 		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+
+	# remove bundled gmp/jsoncpp
+	rm -rf lib/{gmp,jsoncpp} || die
 }
 
 src_configure() {
@@ -85,7 +88,7 @@ src_configure() {
 		-DENABLE_REDIS=$(usex redis)
 		-DENABLE_SPATIAL=$(usex spatial)
 		-DENABLE_SOUND=$(usex sound)
-		-DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp)
+		-DENABLE_SYSTEM_JSONCPP=1
 		-DRUN_IN_PLACE=0
 	)
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index ecaad1b57255..23ea69938ba3 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 339897e42729..338c7479f035 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,4 +1,5 @@
 AUX performous-1.1-gentoo.patch 474 BLAKE2B ff4bdbc43a1129bb4b2d44ac5e818f3f6dccd35ca743345f0934b3cfce66c25c914daf93a4463fa0a30622410737a5983602d1d19fa172bd41e01f3a321ac77a SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338
+AUX performous-1.1-jpeg-9c.patch 591 BLAKE2B 72aac804251366cbaa97c34cdcf9c87d55321059feba00fdc691f7134d9dd47ebf2396072329880bacd6d8e21c3697a2912e93469ba0c98049c0bab0c89622b7 SHA512 1952b59638ed5c0a20f1f4aa9abfd8fce98b7f39d597716c7901593c60fe7efa077ff93a0ad307febf1ac0b3aa88d74559899d511a137a62a77741fd421cfb61
 AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597
 AUX performous-1.1-nomancompress.patch 2368 BLAKE2B e75377ade59604f8dbf2bbe38493d511db8c3b2cae870883881c3108538accc42d42a91334a668b8ab0dd4aa21bf85b024799d4e2edb849cd13f3e21dc4cb460 SHA512 a116b25974426931b3099b502fc8713acac0a5a39f3c0ad12ce76e71d95062970bb05dbd1b01611cb16c3a912e857d668e96b709b4d61f95f38d364fc30d1ad9
 DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
@@ -6,5 +7,5 @@ DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1-r1.ebuild 2362 BLAKE2B 0dcf60de7c873015402ea0b9cfd223bead8c8cf442b5825245cce5b1fefcdcad8165a3348b9711a9eee548c99616af7459725b82bc1663d9c4914aa30c2c36ef SHA512 01a3312700f84c7267738c5321044678951fda6c58f00c6cd78910c3a7dbca32a1e4c54a64d29c799d5663123cd111365a5a7dccf193f6f1a9aa25767e938543
+EBUILD performous-1.1-r1.ebuild 2396 BLAKE2B 77c7868b6df96592739752dc7f000ba023bbf08038656833e9758953642639dea99ed780fd3c86cdc45acb17919634715b7d4b2178920f6ecf6c848f68bbb13f SHA512 e6ff526caa474e19469d61f8f7bd789f1f6afda88ce0fbe7af6789cd5838543ef7ae11f2d334a5317a86687c74aab3c337c3906d659aa34f6600582c4c9073be
 MISC metadata.xml 856 BLAKE2B d467d86270f2f571d310ceac4934aea595a62fa9e234e8897ef0b22871df612cdb335e7e3298a0991db6c98b78ea68b04882de8696150d5acb65944d9ff80c3d SHA512 24da96b0da902a2d54d92e2f74d8c57fdd1e84f35b96d416cb15898485f0387c70f3430e21ba7eebd5bc289f76f02695d246746abe7eb041f9f7e2e0e8e1e4e0
diff --git a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch
new file mode 100644
index 000000000000..d878cec07f51
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch
@@ -0,0 +1,11 @@
+--- a/common/image.cc
++++ b/common/image.cc
+@@ -180,7 +180,7 @@
+ 	}
+ 	jpeg_create_decompress(&cinfo);
+ 	jpeg_mem_src(&cinfo, data.data(), data.size());
+-	if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string());
++	if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string());
+ 	jpeg_start_decompress(&cinfo);
+ 	bitmap.resize(cinfo.output_width, cinfo.output_height);
+ 	unsigned stride = (bitmap.width * 3 + 3) & ~3;  // Number of bytes per row (word-aligned)
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild b/games-arcade/performous/performous-1.1-r1.ebuild
index 774e839768c3..ed88a66edefe 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-linguas.patch
 	"${FILESDIR}"/${P}-nomancompress.patch
+	"${FILESDIR}"/${P}-jpeg-9c.patch
 )
 
 src_prepare() {
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 5ec674311ce8..7ea30d69198d 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/grhino/Manifest b/games-board/grhino/Manifest
index 7c2805bfb365..e12d40098daf 100644
--- a/games-board/grhino/Manifest
+++ b/games-board/grhino/Manifest
@@ -1,3 +1,4 @@
 DIST grhino-0.16.1.tar.gz 1178091 BLAKE2B aa5d0c7aab142aabc39d849cbf18cce5aeb57d42f74ad1e2117c57e735d9a6b383fc284cae82c64d5ed8ac809eb364568133e06f42a1062312512becf87df315 SHA512 17fd5539a9d74a715237a51cbf2f3119feae2bed6a26496b02d7882385d5567571ba4b4c4018554944d07322e5a0c3b3235e141579281621f5a030acbe6480e2
 EBUILD grhino-0.16.1-r1.ebuild 961 BLAKE2B bb979c3934c7a110f9bd1f9999716abf14240e18c5433a0af211dc77c69c2130fad8d9f537493916a7f9c7a9a4e5f9e371f9409e870a9d6bf89f8d29b42f0e47 SHA512 e399e36b3bc2e812d64cc8770bd27186c8c16e6950b42b6b514ee7b77fb2551300ac39b3e89d5995af9226866ed2dd052244aa373575081c9eb40717be38c65e
+EBUILD grhino-0.16.1-r2.ebuild 680 BLAKE2B 1a4c7d6dd9ac0ff256b236b51486741cacc1bf3743f1c188b2997f097cdfc7229b92b92dac0d243ea2cb9c0df597b146f438615e0830b0c3729f3130d58d5220 SHA512 f9b5d42d27d5d78e52a8ecac328dea1c7c6a10ed8c7f546746258b5da38d6e54286f047bc5e2d35acef78df0c9db0073d811d8d529fbebc761727452556c4074
 MISC metadata.xml 513 BLAKE2B a54919c1b021a9e66b91ba91a110e75b9dd687538bc0da2c2beb5f738615e0f034954a7f19273022199efeb47cf1d3933ab5db7ddd8649a492846fd6a020eb05 SHA512 783fb713c40369df38b8aebba6ac6234ee646e097c1992b1ebeb790c3ddd1fa1915c5fcf4f1505f1b6450d9a4ca85e6be7eb38613316a3a475b625906fea6fc4
diff --git a/games-board/grhino/grhino-0.16.1-r2.ebuild b/games-board/grhino/grhino-0.16.1-r2.ebuild
new file mode 100644
index 000000000000..004aa040e4f2
--- /dev/null
+++ b/games-board/grhino/grhino-0.16.1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Reversi game for GNOME, supporting the Go/Game Text Protocol"
+HOMEPAGE="http://rhino.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rhino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	sed -i '/^(\|locale\|help\|omf\|icon\|)/s:@datadir@:/usr/share:' \
+		Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--localedir=/usr/share/locale \
+		--enable-gtp \
+		--disable-gnome \
+		$(use_enable nls)
+}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index f7b106d89af3..57d94ca715e4 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest
index 82b765d6b782..ec72a0648a37 100644
--- a/games-misc/lolcat/Manifest
+++ b/games-misc/lolcat/Manifest
@@ -1,3 +1,3 @@
 DIST lolcat-90.8.8.gem 56832 BLAKE2B 51bcd05f5bd277ae372b224d3ec8c0a041007ea70dc12261388655a6de8172017d88a1c58f58135181dfbfbc1ec63ab762a28db477618d1e80cf31d328885211 SHA512 2517a2e903c52d16c9773a32fae000917741a0b323abc19cdf4cad68f9ba873f059cda5790819e0d2cb057239dca9ac39a191f9e05417a91ef99f2232e8af3dd
-EBUILD lolcat-90.8.8.ebuild 497 BLAKE2B deab7176034f8797dba1b53999e2bc8dc20fb2d14b785911503aafb1c9fb01be8e3c29a80a5edf38c1a45a1963ebb732e4604f62e40dfadd6043ed52062c7406 SHA512 a602dd47fd778d3800d61f41035dcf73351938e38841f739fb0ec02a884c94b2c902be6c0290b77877dc7a48ab449efa8cc5d919c0201494fc123bf65858ea83
+EBUILD lolcat-90.8.8.ebuild 494 BLAKE2B 762425798efb90dd5287b825ae8e1f8dea55b8cad5510f4c2419d58bda9a60d969a8c1b7b20ff3739c7d333873af7c96ddf419cabd7cc14e3d94ee84c1429691 SHA512 80e19d78af527626debe9a667774ad0020688137a725ac6de32173dea26cc7f507e7b075f25b8d6a98d5ea696da20c423f1def05d864d689dbe99b5831f6e191
 MISC metadata.xml 333 BLAKE2B 60f1ec9612c78ba00c9aae4a45ac899651cff451a36ffdfbb317dc1260fd405759fb57c1baff5d9c190fbf3633b2042a1b77c400c063517ba1e437c1a89fda5e SHA512 e31a8b91268a15fad0b382f647e6209b8545163818bab90f16ae7aa43ed0edd46b83a3e94828c3657af65269d17321828f375db5f9ca7402cd8bc6bd8186a3ef
diff --git a/games-misc/lolcat/lolcat-90.8.8.ebuild b/games-misc/lolcat/lolcat-90.8.8.ebuild
index 3e785fac1320..9945e3142225 100644
--- a/games-misc/lolcat/lolcat-90.8.8.ebuild
+++ b/games-misc/lolcat/lolcat-90.8.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 1ff28790d93b..6a637d0efbd1 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 8744ef8619c7..6dec42dd04ce 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -8,6 +8,6 @@ DIST gnome-desktop-3.30.2.1-patchset.tar.xz 3572 BLAKE2B e8a681ea7a3eab8186c89d8
 DIST gnome-desktop-3.30.2.1.tar.xz 1052492 BLAKE2B 064ca0580e00e7561bba73a4ae14fb642fb3c66e9619cf3690df996bbcace27188da0bc33384f06147f69653f43ea7bf73adddeb4477a7d231db66e6dca444ed SHA512 dddce479ccbb7245c6bea0638199118a88ba6d4f8f61e0c673aec2e738c26d9a99053499b3db190f731cf48ef8967feab5e4b253fc96ae68aa19d235bb52b31f
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
 EBUILD gnome-desktop-3.24.2.ebuild 1591 BLAKE2B 53e0503424cc142789ebe095c4b04f064b214e550cdbd88fa5c5943f183f8f63b7830167d754e591f580e6c9b3eb89fa7359fa5583b190bd71722fb59fd7d3a7 SHA512 e8ca8f0ed30fd58901ddbfd253dfb90afb7c100ee19c5533813db02670140168944bd294a1741dd98f83f29c02fcf9b88ef819035144a9e400199203f137f362
-EBUILD gnome-desktop-3.26.2-r2.ebuild 2053 BLAKE2B 5a776ff52fb3757f06f5a013b5c93941780da0f2539feafa897ec4001556b1965161edaa61b61389dfe51998306dc69671c7849f48377d2b35e07902d8f017c7 SHA512 27efb3512a728af66bde8b781a37666ac6a9a28459e4463fad4e8d0366c66022ffcbcead5976d654832ba75e99e8224b881cb93d09e83f17c4858d4b6055b95f
+EBUILD gnome-desktop-3.26.2-r2.ebuild 2060 BLAKE2B 162338d1095af7c06f71f74a3041530a94697a028ba0280b2d1b636f8232963abb13334ce6aa67a64844d3e587ba851ee3fecd5a11f4a31c3201b472a6070cb6 SHA512 09979d7241039cc5f2a82c614b3d0cbbcc7850eb744958645cffb68a64b314a43b21ff53fb8f01610af6066edf8a6b9c63b4509e010985a8ee465818ce8eaf36
 EBUILD gnome-desktop-3.30.2.1.ebuild 2000 BLAKE2B 9c142cd2a339cec15dc5bc8e8a83d64e20e3b492cbb8fa8987217b6d7fc70f8eb082f30f88d00ecc99b8fcf0211a82436265f09c3a1bba9879e5e67657fce8c7 SHA512 f68a558f1a8f0940ce52e6764b6f61a30eae0564095a39544e338c0ce7205badf03ce3e5ddd92fecce57372157db30ec6e13659bb1da7ea84f870bba1278456e
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
index f3b2892bd8b1..aabc9847f481 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/12" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 5e1be3c6bdf7..62039f01644f 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,9 +7,11 @@ AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d138132
 DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
+DIST gnome-shell-3.30.2-patchset-r1.tar.xz 41324 BLAKE2B 4d051a327d106e8431c7b75d56932137dd3af2694c313656bf4751a385a86ef43dd635f31902be0426899746c63f1cd1aa782e9c0827f750fe61683512fbd43c SHA512 3761688e86694be00d81eac2bcd8774d8fdff62f44cdcd26c29b9e7513d2db0edc0ba097e0fea474a232496e3f9b8797e6215a040915a0832517235b26cbc265
 DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6
 EBUILD gnome-shell-3.24.3.ebuild 6629 BLAKE2B 9442d16e86abde07688dfd2a4ac82c88063ed5a0f103b64dc0491a4dafd89cc5b5ef4cf4c25b233749afca00af191f5aa7055e3c255535c2c1eb1842c2bec166 SHA512 059cba2b4b010241c6715579904df48ad58426d2037466b3540165dd78674ef258cec2bc338881c72f4d18eb0f83c69801cc7a056dc03d46f14a9add15f4a24f
 EBUILD gnome-shell-3.26.2-r4.ebuild 6615 BLAKE2B 30ea1dc614bc95f373a596c190553bab87ab2e0a491fa7e34ddceb9e831a461e6047c89ef8ef0e82473b26cbc9699d088b9afdd0abdbeda5561e0a3bf4a0f460 SHA512 24c2e0fbe7e904f55a8a089ff6faf4a1b68c9a9fa31379da79a2491fd5eb1e1f8e8161c68b49856d47366b68bfc2de329025abf3d80aed6045e62d7cdff94d0d
+EBUILD gnome-shell-3.30.2-r1.ebuild 6499 BLAKE2B b3d2ff45b435b997208a0d3e5300853222bb5dedb3eecc7ff825bd0c136b16e2ee715f2b5d4de9f720b9ad54e9522a93d04f2fedb0820105e48db31f97f0ae02 SHA512 5bf7736beca8eee514e939cd062b20dc6738f556705267f4b674a4e6b9c3c1ef39829c1956d319148b80afab0c36deb0b8be14f4fd25434bf5cdad2c20f0bc04
 EBUILD gnome-shell-3.30.2.ebuild 6571 BLAKE2B c518507942af74dfa56d68fc67c75797f925c36ca69bedc240640b5a91a6a26995743489aadff998386394b04fcf991a0163040c8c8501e7acc85270e2c5a3b6 SHA512 5921abd8cf4b2df53db64123339ac134c51db2d397e95a58216601038417ef7e90210baf77a9707cdc9c822464c2f35a5eae41a76426dcf74b3ec06a7a5bf6e5
 MISC metadata.xml 1279 BLAKE2B 4c69dd1979038f6231f4877e5070b7b833377197e5030c97dff5d8d2e36d2dce1510254b97b4d7b9255a64c556d9795c515aea9b21091de3bde6b8499346df9b SHA512 caa5a580e349cfab441bac8f648866618b76528e5bcc0baa6cbe32853bb56786aa0b7cc309ab6515d6a298b5bcdf45ea0360a26c28e64543afb558479ff219c3
diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild
new file mode 100644
index 000000000000..d659f15c9707
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+	>=dev-libs/libcroco-0.6.8:0.6
+	>=gnome-extra/evolution-data-server-3.17.2:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=dev-libs/glib-2.57.2:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.54.0
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
+	>=x11-wm/mutter-3.30.1:0/3[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.27.90
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.2
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	media-libs/libcanberra[gtk3]
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	media-libs/mesa
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-lang/sassc
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Patches from gnome-3-30 branch on top of 3.30.2
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${WORKDIR}"/patches/
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/3.28.3-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
+	sed -e 's/mozilla/nsbrowser/' -i meson.build || die
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
+	pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 64d9097960c9..cf159466d190 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -6,12 +6,10 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e89404
 AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990
 AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7
 AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab
-DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
 DIST nautilus-3.26.4.tar.xz 3267652 BLAKE2B 56986b8d87afc0ea7ce6f1f56ae06c7cfb05d060414aad428145a6c2cb631b9d4ebbeaefabb0f0ceeb5f930ae94737f8dfcabb300554a59c2b7d5a53d1ee3cd1 SHA512 2a50a2a9ae6ffbe4b706d46fb47e5f54f42e645189b3548d1904c3ddf882ef4a94819740c6821fe50c662a9013ab43bb9b7b3dbdfc779ecc82f16170b4867973
 DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
 DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
-EBUILD nautilus-3.24.2.1-r2.ebuild 2834 BLAKE2B 49e34f2586cdbdd09880865fe0118665e00b0438c76f31109a5901f0a8ea8f41272facbc3e1384cd313e261f361df5248a5f2844269eb1f6db6e1c1e86bd29f7 SHA512 c082f2a82cd948edfe20c2cb31b868eeb01ca9ac8e96226abaed3d22b52f58f877b27f031127c285fcdc59a78cf65f33b0c6e815d2b72792dc7ea1f256422d44
 EBUILD nautilus-3.26.4-r2.ebuild 2778 BLAKE2B 774becb8cd3ee153b913e6a15c203fdd40bcf47e2c7bad1bc9333acdd909ec19ac0cec8d5280ab40980386a249ef86629be05ee51db31184bc0db926aa03aaf6 SHA512 481a36457d59e6db0ec049f6e64e9f509f0485c280f28b65c1bdfc98072c8198f9cf9ac8b40bad7186ba9059dca0bcc49a49207bd2c6afc649c7c5c1a9122ad8
 EBUILD nautilus-3.28.1.ebuild 2656 BLAKE2B cd1f74358d8e23af670c498ad510c27e261423ef560b59559be4ceb79745b0db16f61da3580edae7998ca88eb7983401ba656c0a105aca362770f6ad2a08c206 SHA512 6ab0cbc44f446eb9e82d9046aaaee77f1bb34768c2583ed5143fd17f12af7d2f46027f08732f9483fce151091d6cf167e13879e301360056ded4a2326bb9c4d5
 EBUILD nautilus-3.30.5.ebuild 2776 BLAKE2B a8a8b73f4c6151b09cb03a9a0be1064b3388f087967d747a2ef7cd4a2f3da0b5ccdc97212daa77444573959fc79ad8c913875f079e4b30b123461a37c51c5a95 SHA512 67ad73530b9bcc01da31c92991ad8f1308e25332d6a1174f37566b806e1f6ccee1a7fe934cbc93a088b47af00251098859803a7e972fa06ff8fe8ab64e7f0445
diff --git a/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
deleted file mode 100644
index ae97ee6cbaac..000000000000
--- a/gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo-r1 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=app-arch/gnome-autoar-0.2.1
-	>=dev-libs/glib-2.51.2:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.21.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	selinux? ( >=sys-libs/libselinux-2 )
-	tracker? ( app-misc/tracker:0/100 )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-desktop \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable selinux) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5ffee95f65f9..61d480ff3b4a 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 ccfcc9002b0b..5d54bf989afb 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-boxes-3.24.1.tar.xz 1710348 BLAKE2B ce90cc1a6baefa45c1a553b059f4fa7ac5c9a6fbd7a2d71377a9c6f38fddb7ac5a110f38d0a65b45cf2ba948ebee6026cc22b5f93a2ba521c9db6cb20bd3dc37 SHA512 a687dd65af91d717862bba0a81d715b64de1092cbb5ffd8a756fe80988c84110127f186007e8cf4011bf23cc0ec0adb346ead72ef47c655f85a7fcb9ed3ec393
 DIST gnome-boxes-3.26.4.tar.xz 1893760 BLAKE2B 91d01f33b2fb03150c0abd75cb58a9a9ecd8deeb14d32502f5766e06c93b4d236f971417e0a26c44e1250afa069966b607912f2dde92fc5058e598eb029ff03b SHA512 f92f09ea6f61d418253b3b4388bc7aac321cbbba853908b3a8e4faca0e04287cc7c3387eefdd2e150bc9dace8ef5ebbbab3dc3b38b26e0e2d010272703fbf6a3
 DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
-EBUILD gnome-boxes-3.24.1-r1.ebuild 2647 BLAKE2B 9190558020d64cec5c8e2cb568d081c4f975b50ac0f20ae31263bf113067573597c117f816d1dfaea5042451849e04ad4fbdc628761d267dc4a1b0ec6d22d82e SHA512 12a9920bf3e5f2cd1b6fb4809dea9649d193cd6e2dbcbcf94bfa35f0d325ae6e163ab1a53298d80d37e4eb0f62f6ae6ca5363ca548dc6e962215746063142008
 EBUILD gnome-boxes-3.26.4.ebuild 2697 BLAKE2B dbdfac183648543bf49d024fb840585c48406ffa6fdc726af5858f1e06e477aadace46f71fa6a033fcb8ba591c2ca55c2e7a499ecc2176b14e15edac64901260 SHA512 61356a6f305e6bcc3a2b8bb1bf9ee0c7c7ee48164d8ddf7e61469c340578665043003f83f11bb1e0bb3ecb12642321115e7607e05a15897fc664e663a4ca678b
 EBUILD gnome-boxes-3.30.3.ebuild 3589 BLAKE2B 411f8ecb2effd9f20c754da9bdf4c9d7b6d9abe98c35513bc166573248e605366307186efc170493f7e10a09349d664e4bf7e6d35b3d60926021fb8d6bb9cec0 SHA512 ff96ff0f0c31d7bcafc4652d9c28471fb05bd6d32fa65859eee608ef95aa05b21a1a6e47b3c3e3becb92b658813ef26007a7986d10b3064bc7691820e0d0af15
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
deleted file mode 100644
index fb81803cc4a4..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 linux-info readme.gentoo-r1 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
-
-KEYWORDS="amd64"
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-#        to use its pre-generated files so do not copy all the
-#        vala deps like live ebuild has.
-# FIXME: qemu probably needs to depend on spice[smartcard]
-#        directly with USE=spice
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=dev-libs/libxml2-2.7.8:2
-	>=sys-libs/libosinfo-0.2.12
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.2.3
-	>=x11-libs/gtk+-3.19.8:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3(+)]
-	app-crypt/libsecret
-	app-emulation/spice[smartcard]
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	virtual/libusb:1
-
-	app-misc/tracker:0/100[iso]
-
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/mtools
-	>=virtual/libgudev-165:=
-"
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# eautoreconf needs yelp-tools
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Do not change CFLAGS, wondering about VALA ones but appears to be
-	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug needed for splitdebug proper behavior (cardoe), bug #????
-	gnome2_src_configure \
-		--enable-debug \
-		--disable-strict-cc \
-		--disable-ovirt
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 039a1fe9267f..89d608a85e60 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
 DIST gnome-documents-3.26.3.tar.xz 2453132 BLAKE2B e430c5f4dc68578d5fa14a87b0544f20ed6a3f90351abe3fc1505addd65b41affe46981d5035b70fb750a16193eddbfbf205040d3a96e633e8e78ff98e340156 SHA512 d37f763817f617163d1cb85fa8b4d06048a099494e129effdd8e4db7b62178925c6b238150d145565017ce9cf0e2af9acc47623493d4e2df353bab669b076fb6
 DIST gnome-documents-3.30.1.tar.xz 4777500 BLAKE2B 889a089e4968e233185a6018559487e0cede40bbe789bee3e1eaab3283bf66f797dbcf7281361432d0b3a41b68b1914efbfb5be4875fa1986cbe3241a40cbcb5 SHA512 89966d49ececa11ab49eb0e192c6a1d398ef13f2f809a02cca2d13f7ffa4cef45a29801971edec22d2f471ab4291a058c702842e323cb2a1ddd7fcc37d51b6cb
-EBUILD gnome-documents-3.24.3.ebuild 1276 BLAKE2B c502460599d7aa2419f58683a0480cab2d6a575ae969af3ccfc27fa41d4bef25e2d02733838094178ff75956961ad8ccf196cd579004b7c4d2329a0ec93ddd24 SHA512 571ca8d98e15b0ea19add5052c88ee693e463ed38fac286f97ca177773f1e41511e42a0ce6b6835b7973b8098dcf9167244c592aaaa9ed9162b8b7ecd6fe9fb9
 EBUILD gnome-documents-3.26.3.ebuild 1335 BLAKE2B 6cfe3e4c5de98cab11caa6c832077a4cd3a0875dc07772f0859e74c1407ea6dcb1ba8e5c8ce4ae404a5f5bbfa1d6af3bd0cba66ebdb45fca4fddad6bdcf7fc00 SHA512 bc22f2b86ae592a05446517d27377f736bd710ccf07b17c6d033112c1307cbb03a58e26de4db639a294014c2522f20d9421b11dbd5df2589c40ca9d07a5d2e88
 EBUILD gnome-documents-3.30.1.ebuild 1673 BLAKE2B a9aa3fe92b7ea6fbf7df5eaddbbe624fc0cf00c3e235b26b1ac98391c7de78e951dd4f7f8ef469e2c93aa20ed9dce40e2913c4afe15410b68007ab0ad77fd93b SHA512 07d000f2e4b8415c7a49321b0a352a0ebaf084cddc20f87406665586ce7fb86a7024c6bd360f66418f7683caa94ea01a3be88e392d1a478b34dca958f287f872
 MISC metadata.xml 545 BLAKE2B 8439ff865c4f511b16c015eb14f037331dd31cb8430bbd2fe3dc3ddaddc8eafef6f25b9284288e9bd7606ae02170466bc5635629f7bba13dd06a35ca8b121f86 SHA512 ce74bded73ae951c37b8bf2d4d703dcf0e546b786da7e1874a9bc3078d9bb455e17abb2380fabca0b9cb00425117db7782dbc18c9f16d056cc489b2bd1ad53e7
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
deleted file mode 100644
index fa54ce00c127..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-	<dev-libs/gjs-1.53
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6:=
-	>=x11-libs/gtk+-3.22.10:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	gnome-base/gnome-desktop:3=[introspection]
-	>=app-misc/tracker-1:0/100[miner-fs]
-	>=x11-libs/cairo-1.14
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	x11-libs/pango[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-	>=app-text/libgepub-0.4[introspection]
-	<app-text/libgepub-0.5
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 91c6a470881c..b04d95bae9da 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,5 +1,5 @@
 AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0-r1.ebuild 1067 BLAKE2B 1e59a8ba2d63b5822fbf90974509c9df8866844932ed9596a39046a8b602f468a54047718f332c68222a5f15480d24da7ee05122d060e67c9404bb6fc378e43c SHA512 b2b1b61dbf4590b2405389973cd6f5ae26a8357c511e5a8f0f2b988f1302dd8277593ee3371422a866e347623e5a1232013074582f189eeea2d6dabe2a1362c8
-EBUILD gtkhtml-4.10.0.ebuild 988 BLAKE2B 9c380fa816424cf6f7e238664856cd77bd16bfe964ea47c6702b526d8aecaac546d5c76f471b322703e474a95c545c3d4b237db70b598e6ec143ff6067d6972e SHA512 2e0d36666c93de5f672c8218490220e063675eb0310dec0b26f64223913f36ed904e9e09ca292cdd9f7fc519e18986c28813e2f022ea474e1c73b4c533648c75
+EBUILD gtkhtml-4.10.0-r1.ebuild 1071 BLAKE2B 5ccdca5a87b200926bf3d31ed543dbef0c3cfca979a43bee061d739fe1ee1e305bf538864c11701fa093480a9a3448784e12062dc7300a791cda1334000aaf85 SHA512 684b2ecc491ccd1cfe1568dff480f37aac7dc478fd87f7415b07d3fb76402b1baaa81098200749dc2c2f61e5465f95a3e88c62f1f52ceffa73655165cf4d193d
+EBUILD gtkhtml-4.10.0.ebuild 992 BLAKE2B 21238cea54f2b7b7edaae5dfe8c845f62608dfd83da9069d62b6ca996e4cee6ddf2e99215dcef30871ad61687522d0f7d3a2aef881a58a675fd8f06a3b1d18ec SHA512 36653e051126dee0b3f9b222c7e963f27614c779f236b270e00da9e595c724f7f5b5ba7b20c8396686ae4f0ea66a8f66e9875da47fa529d525562390eca994b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
index 22fe176d121f..a6a88c2f7078 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools gnome2
 
 DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index b52c93f9763d..8109c3809982 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 inherit gnome2
 
 DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 5a89f8304b07..99c5986aa78c 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,14 +1,9 @@
 AUX 3.6.4-tracker-2.patch 779 BLAKE2B cd678e663a2579521cbd91af2bf194c436be8b7d2a1b749728a3fc3616d7fb1585922c4ca76c27e7079c1fefd1dc1bb7a595716576b23f097aed7ae6c8601983 SHA512 a3ee36493aef8ef0b5d32a4ca43d961420a263f970f4081888a8c7cbb52e94b9c7c3bfcb9b9ae50454c773305915f1e201b4d1c85520a91d9c0233c35195b178
 AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
 DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
-DIST nemo-3.8.5.tar.gz 1424948 BLAKE2B fc773f7a1666d94beabfaab3b1e97c4a6f32cd61dbb2e5eefc57cb3fd577df780f5d220501d7dbc6c67955afb9a623d36d1631c8b3c5e201894529784ac1991c SHA512 8ae4eafdd056e7e33c722c96a82e8bb5b10617823397927a3247e27bde14a3083f4402cd7e7bfc6a4f7802fe8c7aed005fa912a9855b6accb36af3a7f63b3188
 DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
-DIST nemo-4.0.2.tar.gz 1446758 BLAKE2B 37141bf514b4a17a41876a643f89cb489a7991d2ef0792a23a9b5b08ff1462733e820cde3f23dc1943dec90eb57e9d68ff1e58e526026c738d3f3b71cc0b7957 SHA512 d2c60f379092dee79902877beb2d47d2cfcb4a22b1f86fd84fafb96367c74cc2cd060bdcf8c7fef28ef5ff6df488a4a15f0c8b9fb1680eda26a13208a4a5742c
 DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
 EBUILD nemo-3.6.4-r1.ebuild 2102 BLAKE2B 4ea0140ae77c15aa2b22ba2ae96250a89b21bb253455c90417b46ef3016543b94a135f0048128e7d5e83c8110dbc4588159bc10abcec6744978c928a4341e31d SHA512 62a7a081e10024d62cc2d211a0780181deadfa40270cab9adbe51a5f22c5a512ac8edd446d0424f7a51a3221a4f552c287d7178fd9d7a23da4c0c6aeb21826df
-EBUILD nemo-3.6.4.ebuild 2084 BLAKE2B bd1ced9533fa6c2f65e4c4cc09a2cd0b25a46beb1a30c1ffa96ed8fa4a199ba6d15176fa0ad99051b6c1c836c67ac9495df0564a8b7d1cc97fb89351d3f5fc09 SHA512 1108f55d96be0a639eac59a83acc89a14c26cce5bd02bff37df8747f96034db565177d01bc135a653b4bad0d32543b046a80250f1b2d25c383a608073b1d97ed
-EBUILD nemo-3.8.5-r1.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
-EBUILD nemo-3.8.6.ebuild 1970 BLAKE2B d8f77a2586b83d373594ecc0c9e6fc88ed14d10b07768b9de7a7b465ed0de229f8fd1f63e8d0b19a3447fd8857f4c4cf7149384321216d2e036c2213ac5032c1 SHA512 08296f07274babe27df20e978a9241ce2041c735fe997aef0993a35e371d42b3053087a1505a0f84b2e0d9f4c8c1a8cbc61767fc66eda2cf85bf79c50cb7f53e
-EBUILD nemo-4.0.2.ebuild 1970 BLAKE2B b4833fea21f5a166e2f24c658d356d2a87780f1302faa24821a7237bae1bee0a6f5e463a38a307cb37dc4580e9d04e6b8a872627a2ece623450120d6638ab5ad SHA512 f83144c5d6ccca761064f21b82ae2b60a2934926552e5f9c0a73e01433400cd925dac241b2b69fb3768e74ed1a1ce91008ea313847f8e15b9b1bcf986ee09681
-EBUILD nemo-4.0.6.ebuild 2057 BLAKE2B 20401b16500cf3395554b847e5374226e64a342d6e72bff5dda51913882f17f0c965ce5678bca753c886a2aae7ea9bd82388402fe128beb7e0c842c525d850e0 SHA512 92777c6ee8139efe815336f58b6cf4a161c1c34c7d04b6f2154b422b4d5f3fb02c8bd579e95ee1a64010f4355b0c32db9d6517f783f820dc23de179d4788068a
+EBUILD nemo-3.8.6-r1.ebuild 1995 BLAKE2B 9079ca667c1dc132f85c656d28b2125720a40443509ffd7f5b5a0dc3c3ca921bb0f8df1146fadbfd1a6a5bb4f29dfc2f5c2ed16ba3a96ed47a8c7d6e21084130 SHA512 8367b8957a2282f5dcfdfe8b98f8ef019eca89a4225b17d53634c2d157feb8af6cccddf158fabb0c1bcfbe5f4f8c185a3b77ea88506a3b473074ae71ac2e6a25
+EBUILD nemo-4.0.6.ebuild 1995 BLAKE2B cfcdf828d36d552cce7adb9c3c663dd24ad754965da507dafa1a437e3e607ed85b8299c9cb560b2c896aaf1b6b5f4c5115f682c26199a77b741703005559d5f6 SHA512 5f41ef563465e27f40a4e59227e6280109ef8521a62a02d3eaa8a4c39074795784b214ee843e69a7ce9c3ce835ff33a1b6419603e4056942fae8d20ec44a6417
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
deleted file mode 100644
index bba409dbc557..000000000000
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +nls packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	sys-libs/libselinux
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
-}
diff --git a/gnome-extra/nemo/nemo-3.8.5-r1.ebuild b/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
deleted file mode 100644
index c4ae41b45371..000000000000
--- a/gnome-extra/nemo/nemo-3.8.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit meson eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +nls packagekit selinux tracker xmp"
-RESTRICT=test
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	gnome2_src_prepare
-}
-
-src_configure() {
-	meson_src_configure \
-		-Dexif=$(usex exif true false) \
-		-Dtracker=$(usex tracker true false) \
-		-Dxmp=$(usex xmp true false) \
-		-Dselinux=$(usex selinux true false)
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/gnome-extra/nemo/nemo-3.8.6.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
similarity index 91%
rename from gnome-extra/nemo/nemo-3.8.6.ebuild
rename to gnome-extra/nemo/nemo-3.8.6-r1.ebuild
index c4ae41b45371..4ddc41997b43 100644
--- a/gnome-extra/nemo/nemo-3.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
@@ -34,7 +33,7 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
+	tracker? ( >=app-misc/tracker-0.12:= )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 	selinux? ( sys-libs/libselinux )
 "
@@ -65,9 +64,7 @@ DEPEND="${COMMON_DEPEND}
 # For eautoreconf
 #	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
 
-src_prepare() {
-	gnome2_src_prepare
-}
+PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
 
 src_configure() {
 	meson_src_configure \
diff --git a/gnome-extra/nemo/nemo-4.0.2.ebuild b/gnome-extra/nemo/nemo-4.0.2.ebuild
deleted file mode 100644
index 84fe05b0dad9..000000000000
--- a/gnome-extra/nemo/nemo-4.0.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit meson eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +nls packagekit selinux tracker xmp"
-RESTRICT=test
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.4.0
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:0/100 )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	gnome2_src_prepare
-}
-
-src_configure() {
-	meson_src_configure \
-		-Dexif=$(usex exif true false) \
-		-Dtracker=$(usex tracker true false) \
-		-Dxmp=$(usex xmp true false) \
-		-Dselinux=$(usex selinux true false)
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/gnome-extra/nemo/nemo-4.0.6.ebuild b/gnome-extra/nemo/nemo-4.0.6.ebuild
index 80cd39e0275d..4aa693cf74b4 100644
--- a/gnome-extra/nemo/nemo-4.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-4.0.6.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit meson eutils gnome2 python-any-r1 virtualx
 
@@ -67,10 +66,6 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
 
-src_prepare() {
-	gnome2_src_prepare
-}
-
 src_configure() {
 	meson_src_configure \
 		-Dexif=$(usex exif true false) \
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 4a7792bfc29a..ded46f51bb95 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 348afc02cc4b..bd99ff3b7dec 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -5,5 +5,5 @@ DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c90
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
 EBUILD opendmarc-1.1.3.ebuild 768 BLAKE2B f9fcb819281ac3eadbfc22875fdfa0d663cd5c73c9e4221ade6af260ae0f3bfdbb5b396de53b297a7346120cbc36b06a698d6ae1cb3df0b916a1842944751d2e SHA512 d2f7ae5dd159315b6f96bea798796cd6ee9ff7a3fd07329c80e7764fc1e9d9cc35fab481dccb369dea0f1682590ecc17ec45448be514602626bd565dab527257
 EBUILD opendmarc-1.3.2-r1.ebuild 1522 BLAKE2B d75259d5ce9c44e3f8ba59bba674d520d886d150843298dbef587843f842d7ca8c9b368140ab4daffba1c4222245254d818bc868d5e33c6c4e18b4618c280093 SHA512 27d9c2f088c7a5789837e49e8357a3f7100852e752786060d5eb00854cbf552bf3803364ecb181aae7c13b2e5e2abfeb21f8b11ca08e98259618e77eca170250
-EBUILD opendmarc-1.3.2-r2.ebuild 1665 BLAKE2B 992f7c09da82d52e5385eeb4944e3fd5ae0aeed0ed4d071434458eb5c28449ad6849983cbe1dc6f86c5e67acbbdeb9fe29115c527e13230be08ac51ebbfcf2ba SHA512 463df4aafd0bdfa53914f9e0cad8f90be15d80fb618bb8aafba934bba49d936831247a2e2054de95905543d07573282663ee28685f8494d81896496e5f6268d8
+EBUILD opendmarc-1.3.2-r2.ebuild 1663 BLAKE2B d39bf2727420661f151a3178be8ce796ebd99194f1bf2ed97890a4c2678a4d4652f08e9d404ff54445f33db5a8ed282d8d58f0b856d96b84c7bc7a1be623cab3 SHA512 e34928a6a701c112e10f1ea003c39a1c0f6042484f79b05889c8c0f38b6253ea1165f3e1c0e0a583c6a24628c35ca3066f5551cfb548f0184e056fe0021588b5
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 8704d856f53d..f1b22e9d8da2 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 42778eae35a8..590e3adf5080 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index d6920ec12b2e..ffdbfcf02c0c 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,3 +1,5 @@
 DIST protonmail-bridge-1.1.3-1.x86_64.rpm 53554820 BLAKE2B 2fb0eb7b1a1d95ed3cf5785e527692497429f73eeb37dd9a98da7b5b30cafde048898026c8934b76630976585eb43c0a9392efdcb10b8f2ae8002884312a9142 SHA512 61a4a28fe9efbeeaecd79392eb730916e67dfffc1bcc5bbee156e3dd786dfeae5b39092ccab4c6d5ff9719d0792752732b52bc87615a7922c16cf6203eb57f5b
+DIST protonmail-bridge-1.1.4-1.x86_64.rpm 53566050 BLAKE2B 1221a885680704f9018cf8676c747cd6ffae9b1b351ce3bc47213af81c181ea1f5aa8ee3238bc9c93d115c09e2f0389b75eb1c8d5c8274bf812bf4050f9c0dfb SHA512 87668ba2563ebe3d815538c74591d1281bb0f882863528e56a0b6571feb95ddebe2b2cec89564f009429458eac703f7613bb2c6a8bb3f5d07c45b5ff76b486bd
 EBUILD protonmail-bridge-bin-1.1.3.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
+EBUILD protonmail-bridge-bin-1.1.4.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
 MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild
new file mode 100644
index 000000000000..35b2fe8b0702
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-sound/pulseaudio[glib]
+	sys-apps/dbus
+	virtual/opengl
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+"
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Some bogus files got into package.
+	rm -rf usr/lib/.build-id
+
+	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
+	cd "${S}/usr/lib/protonmail/bridge" || die
+	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
+
+	rm "lib/libQt53DCore.so.5" || die
+	rm "lib/libQt53DExtras.so.5" || die
+	rm "lib/libQt53DInput.so.5" || die
+	rm "lib/libQt53DLogic.so.5" || die
+	rm "lib/libQt53DQuick.so.5" || die
+	rm "lib/libQt53DQuickExtras.so.5" || die
+	rm "lib/libQt53DQuickInput.so.5" || die
+	rm "lib/libQt53DQuickRender.so.5" || die
+	rm "lib/libQt53DRender.so.5" || die
+	rm "lib/libQt5Concurrent.so.5" || die
+	rm "lib/libQt5Gamepad.so.5" || die
+	rm "lib/libQt5QuickParticles.so.5" || die
+	rm "plugins/audio/libqtaudio_alsa.so" || die
+	rm "plugins/audio/libqtmedia_pulse.so" || die
+	rm "plugins/bearer/libqconnmanbearer.so" || die
+	rm "plugins/bearer/libqgenericbearer.so" || die
+	rm "plugins/bearer/libqnmbearer.so" || die
+	rm "plugins/canbus/libqtpeakcanbus.so" || die
+	rm "plugins/canbus/libqtsocketcanbus.so" || die
+	rm "plugins/canbus/libqttinycanbus.so" || die
+	rm "plugins/designer/libqquickwidget.so" || die
+	rm "plugins/designer/libqwebengineview.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
+	rm "plugins/gamepads/libevdevgamepad.so" || die
+	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
+	rm "plugins/generic/libqevdevmouseplugin.so" || die
+	rm "plugins/generic/libqevdevtabletplugin.so" || die
+	rm "plugins/generic/libqevdevtouchplugin.so" || die
+	rm "plugins/generic/libqtuiotouchplugin.so" || die
+	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
+	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
+	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
+	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
+	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
+	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
+	rm "plugins/iconengines/libqsvgicon.so" || die
+	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
+	rm "plugins/mediaservice/libgstcamerabin.so" || die
+	rm "plugins/mediaservice/libgstmediacapture.so" || die
+	rm "plugins/mediaservice/libgstmediaplayer.so" || die
+	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
+	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
+	rm "plugins/platforms/libqeglfs.so" || die
+	rm "plugins/platforms/libqlinuxfb.so" || die
+	rm "plugins/platforms/libqminimal.so" || die
+	rm "plugins/platforms/libqminimalegl.so" || die
+	rm "plugins/platforms/libqoffscreen.so" || die
+	rm "plugins/platforms/libqvnc.so" || die
+	rm "plugins/platformthemes/libqgtk3.so" || die
+	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
+	rm "plugins/position/libqtposition_geoclue.so" || die
+	rm "plugins/position/libqtposition_positionpoll.so" || die
+	rm "plugins/printsupport/libcupsprintersupport.so" || die
+	rm "plugins/qmltooling/libqmldbg_debugger.so" || die
+	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
+	rm "plugins/qmltooling/libqmldbg_local.so" || die
+	rm "plugins/qmltooling/libqmldbg_messages.so" || die
+	rm "plugins/qmltooling/libqmldbg_native.so" || die
+	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
+	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_server.so" || die
+	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
+	rm "plugins/renderplugins/libscene2d.so" || die
+	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
+	rm "plugins/sensors/libqtsensors_generic.so" || die
+	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
+	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
+	rm "plugins/sqldrivers/libqsqlite.so" || die
+	rm "plugins/sqldrivers/libqsqlmysql.so" || die
+	rm "plugins/sqldrivers/libqsqlpsql.so" || die
+	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
+	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
+	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
+	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
+	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
+	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
+	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
+	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
+	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
+	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
+	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
+	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
+	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
+	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
+	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
+	rm "qml/QtLocation/libdeclarative_location.so" || die
+	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
+	rm "qml/QtNfc/libdeclarative_nfc.so" || die
+	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
+	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
+	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
+	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
+	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
+	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
+	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
+	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
+	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
+	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
+	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
+	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
+	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
+	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
+	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so" || die
+	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
+	rm "qml/QtScxml/libdeclarative_scxml.so" || die
+	rm "qml/QtSensors/libdeclarative_sensors.so" || die
+	rm "qml/QtTest/libqmltestplugin.so" || die
+	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
+	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
+	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
+	rm "qml/QtWebView/libdeclarative_webview.so" || die
+	rm "lib/libQt5MultimediaGstTools.so.5" || die
+	rm "lib/libQt5OpenGL.so.5" || die
+	rm "lib/libQt5QuickWidgets.so.5" || die
+	rm "lib/libQt5EglFsKmsSupport.so.5" || die
+	rm "plugins/position/libqtposition_serialnmea.so" || die
+	rm "plugins/webview/libqtwebview_webengine.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
+	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
+	rm "plugins/canbus/libqtpassthrucanbus.so" || die
+	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
+	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
+	rm "qml/Qt/labs/handlers/libhandlersplugin.so" || die
+	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
+
+	default
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR usr "${D}"/ || die "Failed to copy files"
+
+	dosym "protonmail-bridge" "/usr/bin/${PN}"
+
+	insinto /etc/revdep-rebuild
+	newins - "50-${PN}" <<-EOF
+		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+	EOF
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8957aa55a36e..31cbe680e55f 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 442d155e6d46..b8eef711f979 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,7 +1,9 @@
 AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9
+AUX dcraw-9.28.0-gimp-2.10.patch 1182 BLAKE2B 25a71d36fe20ea97b17f13a65e09fbbe786bffb4c57ea398adc83933bb8cdae27a5db8f0b12cc1e51671aa70e2da14755e5aefa2f035060d08da99c7d51e23bf SHA512 e237cf9e917f451bb141dc86dd80c4a78eeb7b42ccda28eabb94b2516dff4ef7148b97a34b61ab27fb9743b3a40f81ab2e416ff0950ffdffdae3a98925896c0c
 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
+EBUILD dcraw-9.28.0-r1.ebuild 3084 BLAKE2B 0a8de6920bf4d5ab40e898f4ca0d1b5e9e8534e53ebac637be75bfa6611e5fdb1bd15a24f175797f25218e92fc4f5d37a48e1305e5477b595ebde58a8c4d7ab0 SHA512 634922d9ca3315895fbd4d26ef562d617a0b70e98fb6c9917e02a07b0b8b7d2ad2ef472ff9a674f9b069caa6fd16b2f31791d58044c549db226d98121bc027e0
 EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
new file mode 100644
index 000000000000..c7b42e82e2e3
--- /dev/null
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Command-line decoder for raw digital photos"
+HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/"
+SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
+	mirror://gentoo/parse-1.73.tar.bz2
+	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
+IUSE="nls gimp jpeg jpeg2k lcms"
+
+COMMON_DEPEND="
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	jpeg2k? ( media-libs/jasper:= )
+	gimp? ( media-gfx/gimp )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	gimp? ( virtual/pkgconfig )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/netpbm
+"
+
+S="${WORKDIR}/dcraw"
+
+DOC_CONTENTS="
+	See conversion-examples.txt.gz on how to convert
+	the PPM files produced by dcraw to other image formats.\n
+
+	\nThe functionality of the external program 'fujiturn' was
+	incorporated into dcraw and is automatically used now.\n
+
+	\nThere's an example wrapper script included called 'dcwrap'.
+	This package also includes 'dcparse', which extracts
+	thumbnail images (preferably JPEGs) from any raw digital
+	camera formats that have them, and shows table contents.
+"
+
+run_build() {
+	einfo "${@}"
+	${@} || die
+}
+
+src_prepare() {
+	default
+
+	# Support gimp-2.10, bug #655390
+	use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch
+
+	rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename"
+}
+
+src_compile() {
+	local ECFLAGS="-O2" # Without optimisation build fails
+	local ELIBS="-lm"
+
+	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
+	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
+	use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes"
+	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
+
+	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
+
+	run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
+			$(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \
+			$(pkg-config --libs gimpui-2.0)
+	fi
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			has ${lang} ${LINGUAS-${lang}} \
+				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
+		done
+	fi
+}
+
+src_install() {
+	dobin dcraw dcparse
+	dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap}
+
+	# rawphoto gimp plugin
+	if use gimp; then
+		insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins"
+		insopts -m0755
+		doins rawphoto
+	fi
+
+	doman dcraw.1
+
+	if use nls; then
+		for lang in ${LANGS}; do
+			if has ${lang} ${LINGUAS-${lang}}; then
+				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
+				insinto /usr/share/locale/${lang}/LC_MESSAGES
+				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
+			fi
+		done
+	fi
+
+	readme.gentoo_create_doc
+}
diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-gimp-2.10.patch b/media-gfx/dcraw/files/dcraw-9.28.0-gimp-2.10.patch
new file mode 100644
index 000000000000..f590243a9867
--- /dev/null
+++ b/media-gfx/dcraw/files/dcraw-9.28.0-gimp-2.10.patch
@@ -0,0 +1,27 @@
+--- a/rawphoto.c.ORIG	2018-05-10 14:06:37.553419235 +0200
++++ b/rawphoto.c	2018-05-10 14:06:37.553419235 +0200
+@@ -105,8 +105,15 @@
+ 			  load_args,
+ 			  load_return_vals);
+ 
++#if HAVE_GIMP_2_9
++  gimp_register_magic_load_handler ("file_rawphoto_load",
++    "3fr,arw,bay,bmq,cine,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,ia,jpg,k25,kc2,kdc,mdc,mef,mos,mrw,nef,nrw,orf,pef,pxn,qtk,raf,raw,rdc,rw2,sr2,srf,sti,tif,x3f",
++    "","0,string,II*\\0,0,string,MM\\0*,0,string,<?xml");
++      gimp_register_file_handler_raw ("file_rawphoto_load");
++#else
+   gimp_register_load_handler ("file_rawphoto_load",
+     "3fr,arw,bay,bmq,cine,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,ia,jpg,k25,kc2,kdc,mdc,mef,mos,mrw,nef,nrw,orf,pef,pxn,qtk,raf,raw,rdc,rw2,sr2,srf,sti,tif,x3f", "");
++#endif
+ }
+ 
+ static void run (RAWPHOTO_CONST gchar *name,
+@@ -225,7 +232,7 @@
+   layer = gimp_layer_new (image, "Background", width, height,
+ 			depth == 3 ? GIMP_RGB_IMAGE : GIMP_GRAY_IMAGE,
+ 			100, GIMP_NORMAL_MODE);
+-  gimp_image_add_layer (image, layer, 0);
++  gimp_image_insert_layer(image, layer, 0, 0);
+ 
+   /* Get the drawable and set the pixel region for our load... */
+   drawable = gimp_drawable_get (layer);
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index fcde4a4b465b..b8c0b927d856 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,8 +1,6 @@
 AUX 3.26.4-support-tracker1.patch 1094 BLAKE2B 224f4052fe379d79ca9fa02dc0d7e19196c5016e6f8e6936f620697d27f063aa421bd37dfa159856fedf0971095bc302f36591788923483729380dc9e754acce SHA512 32c1dcea04be037827d9c6b23ce38e3cb1d7548233f0569c58b87b3dcca25a060933dbbf89d8f2a5bac442c7fde854efc72f27df3e6eed9d0d0ee163a02e1763
-DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22
 DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
-EBUILD gnome-photos-3.24.6.ebuild 1794 BLAKE2B dce8b2a44345c35c19058389cfa48d0e9f4e50f427e7d5406e09515598a13c6569b886cdf8e6effcaa9d87ad2ea693596ab49aaa6d8eb9ac930b28749bc6f1a3 SHA512 0a27e45dbdb2adfa84a8eb389a8342a9fa58f5d98d0142c1ab4817f7c2e5f247b7702968190947ad25db6ed1f7fe3a91be9683c5f57010600a2a890b8ca84975
 EBUILD gnome-photos-3.26.4.ebuild 2060 BLAKE2B f5a8f491495c415fb3c0a3adae4e19f28f9c4fd1327cad0a197ac0612dcb6a8650d125db298977e641ef10264942a04968d3b722c97f406a6be86499641115ce SHA512 14d25f1d2f6e95de682c020eef13ab0d79b6246b5e4495a795021545dc49590b3c155ac33fc90bc3bb1add1aa5cac61294aea6080142698b9586cc83c0cbcf66
 EBUILD gnome-photos-3.30.1.ebuild 1951 BLAKE2B 0abd314d897dc1f6ab6fa76ba518e848550018ebd86ec80ac7d546959e3b7dfef3bf9adab9669b949cb6025e054922db032baa32e4f231721d7f990f4c7fcf57 SHA512 b7ed7697606e80043df70668ddd81e2591cffd0574ae8488a4e1ec92b210ceb689a5c12034353500b458c5f2f04cc5666c91bc32032d4f5dac6d7e6e51a43913
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
deleted file mode 100644
index 8b380b9f0ca6..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flickr test upnp-av"
-
-COMMON_DEPEND="
-	app-misc/tracker:0/100[miner-fs]
-	>=dev-libs/glib-2.44:2
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw]
-	media-libs/gexiv2
-	>=media-libs/grilo-0.3.0:0.3=
-	>=media-libs/libpng-1.6:0=
-	>=net-libs/gnome-online-accounts-3.8:=
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	sci-geosciences/geocode-glib
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22.15:3
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# XXX: how to deal with rdtscp support, x86intrin
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 154e5a70839e..4d93c0d7e591 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,5 @@
+AUX maim-5.5.1-libjpeg-9c.patch 530 BLAKE2B 85812241df5f570fce5708ade7fcec5548c760249b535141b9f80251964fdb2faf31f24377d847d6fa85eb5fb5e978f36d1fa03858199a5ecff5d0320a2f6afc SHA512 2bb8bcd29b1a477cdbace3da9d4395a072b35cc378ba9f89b98d23653a2219674269744eb5caa64423d4ec999279acb7ac489a273be22e32f9f3279898ba2ab6
 DIST maim-5.5.1.tar.gz 39601 BLAKE2B f87daf54bad43ba92d57878cd2f368eb071aa43f1258125895e676fec1bb407308d72807cb200f8887d376b8c3b81885fc0cb31ba15115ce8f670aa3ad458425 SHA512 72bbf945df21403f51ccd8d2e5775e1a229ad6b362c4a1eb29d92d1b2fb679a48703bc195476e7ec9e661be7a6f1c076199a7d881a40b82fa99c1ded7d2be118
-EBUILD maim-5.5.1.ebuild 884 BLAKE2B 07480cf8d249dadb6379146d114506e34300eb5afb4c4080a564321288d1329164238aa325c2f355bb58f22bf8873e7fb400be53cfa83a6e02a346d3da58f4c1 SHA512 b9e93ed46bfb17b12c5f346b8ea8dc7f07a4aa77915f10243c96d2db33c1d33607dfda2c5ef323c2f7155dacd3b3e7afbea7260071cab5ea04364075410dc118
+EBUILD maim-5.5.1.ebuild 937 BLAKE2B 48983ae6f94fdfc916a91223528df3f8464f91cd752cbbc504d0a3ff4c243d2bd4f124818b16ddac03135bd4610474823d41603d907ef19d0ae50dc2439b122e SHA512 4920a23241240179b7c94beab46fb5193bd7682790e3445e9d53f3ddf516eaf054cc3cd5c4abd9e5462e5578583a54ef422ce1bdcbc8d61b736ab610073c3db8
 EBUILD maim-9999.ebuild 842 BLAKE2B c3a9c035b9f61ee9fff6a6c7c54a2db9ed0687f10190683dd5faefe34b5b970ac656756570e9076d2f4f6f33017f8065b5aa63de13b20de7a944a7c5b6e69534 SHA512 4414a8454d073013a62ed8a9ad7b6e105406a59fa8120415ab16a85f952484778e7a1864595ff12dd3c1b523990a61d5a072118940b23f59eba8653cc1be872e
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch b/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch
new file mode 100644
index 000000000000..83029fab8283
--- /dev/null
+++ b/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch
@@ -0,0 +1,16 @@
+Allow building with libjpeg-9c
+Bug: https://bugs.gentoo.org/656520
+
+--- a/src/image.cpp
++++ b/src/image.cpp
+@@ -187,8 +187,8 @@
+  
+     jpeg_set_defaults(&cinfo);
+     // Convert quality from scale 1-10 to 0-100
+-    jpeg_set_quality (&cinfo, (int)((float)quality-1.f)*(100.f/9.f), true);
+-    jpeg_start_compress(&cinfo, true);
++    jpeg_set_quality (&cinfo, (int)((float)quality-1.f)*(100.f/9.f), TRUE);
++    jpeg_start_compress(&cinfo, TRUE);
+  
+     JSAMPROW row_pointer;
+     unsigned char* buffer    = (unsigned char*)data;
diff --git a/media-gfx/maim/maim-5.5.1.ebuild b/media-gfx/maim/maim-5.5.1.ebuild
index cb8869b7b809..a225be4803af 100644
--- a/media-gfx/maim/maim-5.5.1.ebuild
+++ b/media-gfx/maim/maim-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.5.1-libjpeg-9c.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DMAIM_UNICODE=$(usex unicode)
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ffec680687fb..2c4cbc01f019 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 771be7763888..7aa44c9d4e11 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -5,5 +5,5 @@ AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb
 DIST ctl-1.4.1.tar.gz 996923 BLAKE2B 20dba7a3cb93e89ecb656a6ee34b35e1a35c3c4cda63bafe2162de15afca4b8e32f2156a0b1b2268d59bc5923c1687817433c41031be07b810762f9feea36fc8 SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 EBUILD ctl-1.4.1.ebuild 746 BLAKE2B 95436778c6f9687dacc3969eda2530510b401e4c498e41c80b035d7a261caa2daee22f8f5ed5b0941c5b5c36a05d03f49cd6fe0105f811347b347703da753998 SHA512 f4e82d25b87b3704d60cc3701a4dbb91c0eb47716d33444a1fb2cdf5961d2b4e6e4d7b7666c51456bc2b2019f13afbfd3b239e4671085bce5d5723f2fa845802
-EBUILD ctl-1.5.2-r1.ebuild 723 BLAKE2B d2d06631c5a91a2e56cb803e7a7cf13deb1d63c2d66a18615e6f68e273ac7a91aca2f716e6cbc1fe1b3ed5a5320672fe85bc5a67a6009da2a89ff74002964d8e SHA512 67db689dd989f65a45443527afc8cefb54c4e538e34e02bc3dbc6b3ce39a891c1b5e4a76eb2549e7315bd443b758b349addb39ebcfaf79c8186299320b16dcfc
+EBUILD ctl-1.5.2-r1.ebuild 722 BLAKE2B 20afc62fd4e49c38447e68be8872bad0186ec5ef14d154481a8dc00f896b1a07e7ca6cd9f144a9c0bc96bf2d0649e6bab63915de629458ee000d9c2125e1f8eb SHA512 7d91f8fa1a13fffeff82e254eeda24b52e3a7e9db4d2cd13435c9b117d3953d45de89ae639b77c64d1df7635e5ff10c8477c7d56b5482ca8990c4d562bf67f18
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index d5a522c636b9..606bb7995b63 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 178cc41d77f8..d9477d70eec4 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -6,7 +6,6 @@ DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaa
 DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
 DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
-EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
 EBUILD jpeg-9c.ebuild 1996 BLAKE2B 551b1beaea68d26e51597259209c60cb2134cc4a2367ca30e8461b7b334362852771ccd190307ece3bf1c09c32ef8935391c69d21f27d5dc0480b453e215f4bd SHA512 1712e96882b6643520f2b40df62bcf03e8a01f89051b8890c7a2b320fae095ed7cd7e524326a52a602f2d699309a74b08626cc8d28c33b08819b8d6441916fc6
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
deleted file mode 100644
index 2c7155f00bd5..000000000000
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
-	mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="!media-libs/libjpeg-turbo:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-7-maxmem_sysconf.patch \
-		"${FILESDIR}"/${P}-CVE-2013-6629.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Fix building against this library on eg. Solaris and DragonFly BSD, see:
-	# http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
-	local ldverscript=
-	[[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--enable-maxmem=64 \
-		${ldverscript}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		# Build exifautotran and jpegexiforient
-		cd ../debian/extra
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	dodoc change.log example.c README *.txt
-
-	# Install exifautotran and jpegexiforient
-	newdoc ../debian/changelog changelog.debian
-	cd ../debian/extra
-	emake \
-		DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-		INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-		install
-	# Remove +x bits from man pages.
-	find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index 77b712c3698d..b3201e2de370 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
-AUX libmng-2.0.3-jpeg-9a.patch 1231 BLAKE2B 0b9c55af1a88d836cf753410da6299a7c19f94055175034b7c204f991b7773fbfcbd46417ac69a4dfab4078fd2ae11a811051f9e7b297081bb79cd2a3aa0633a SHA512 4b4fbfa226394a1ae8e33ff9db8f0a7c9754873d27beaf0a59a4e34b0d38794314f29c0a76b9e7b6b3d792d856ee8e040c8669367ee0f1e0d5d36000418d403f
+AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.3.ebuild 1171 BLAKE2B 2c698f9b5f7b0e7d08a0fe0fa91b0d4036972eb66818f752b0d5b0cdada6bc727d1e6b3972f130f25113d744664c3e0ac53095e215d8e09f9c0e39fcdae36f31 SHA512 4b5bbe4ffb5163e8ae03884f770302dac29d69d47b6b424c670832cc18f8797e8c33e50360adb6704cc9af4b57e6b243d5a176517e76357a56b1b902d2edb187
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
index 9441f00137d9..459b42e7db72 100644
--- a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -28,13 +28,17 @@ https://bugs.gentoo.org/578744
 
 --- a/libmng_types.h	2015-04-20 21:17:32.000000000 +0200
 +++ b/libmng_types.h	2018-09-06 22:56:57.153190623 +0200
-@@ -201,9 +201,6 @@
+@@ -200,13 +200,6 @@
+ #undef FAR                             /* possibly defined by zlib or lcms */
  #endif
  #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
- /* There has been a change in jpeg-9 : */
+-/* There has been a change in jpeg-9 : */
 -#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
 -#define HAVE_BOOLEAN
 -#endif
- #ifndef _WIN32
- typedef int boolean;
- #endif
+-#ifndef _WIN32
+-typedef int boolean;
+-#endif
+ /* For jpegsrc.v09a: */
+ #include <stdio.h>
+ #include <jpeglib.h>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a864b6a2602b..404aefa6a474 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,11 +4,13 @@ DIST mesa-18.3.5.tar.xz 11882012 BLAKE2B 88279fe2f24c2a47c8857ad34382b7c8b641196
 DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487
 DIST mesa-19.0.0.tar.xz 11959360 BLAKE2B e58144bb22f296175d7feb59d2c7940ca795dd417b0b014735d8842a29292cf07a6197184942febfdc85ad062267a55059e0ebd1532a886610dabf888cc68b8f SHA512 5759b85275bcd145513cf14a9ef7505595766fb33b82c53738f74ede462e5850580d48ab4af326b41209e7f4b05aab75539f2bfebf67c3098a4680ea95c37591
 DIST mesa-19.0.1.tar.xz 11962308 BLAKE2B 29abd27c4daa3b2ea3e10cbab4a0491c0bbbf6985ee39c84dd4dfa5fd5cf35ae32201b0cc312bd40cad8602ecc42b9d5ed586133bde83dd023b3d2fdb0fd8249 SHA512 13afade840dfc44198b08298c9ebeb24c626c98bfff3ec6d08daaaea690ea9d47af466c877146f9afa3b45035e02c1e21fdc4b53a79c99e38dfc6126efe8ece5
+DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
 EBUILD mesa-18.2.8.ebuild 13549 BLAKE2B fb6a17fbaf4043b16e264c46608844026751a613650fc2fb1929d7534b9fdd7e1a4efef5c90634490234e5b1a437df944afb611c0c65c81dcc735a7dbfefb100 SHA512 e36990056e9e20b6ad7fd9af6d1baf0322482e84aca03c727ebfc6686ae117640dfb208dd1b33669836a7c962b2e93f4871af5c49eaab51198942dfa2e1a1548
 EBUILD mesa-18.3.4.ebuild 13684 BLAKE2B f6628df530fd9c2985969b9de8a794147234115ac5a4bdee64d3bde10ffd2fa794bf11780131427154a19d400b490abc258fc0cc791dc0d2db5f8c89de12c576 SHA512 7d6bfc9ed513776f53bb9e76039fe13929539c385e052a767b95c4f2bace4c207b1c12a206ca22e0c2a2273a729a7b6964b6c9e87e626b5c87268f9a849061e1
 EBUILD mesa-18.3.5.ebuild 13685 BLAKE2B bed1f431a88d2ed2617e28af453100e4d044565643e86b429a15d2ed5edf4a77e14c7621d2664b0f8dbc7e3a2b8b3af6419001c00c5651fada999927f54b3e8e SHA512 89344628dd480c3efbb65857cd5f3b632d9678bedd94cad8c7c7dfff1e5440468c7ae91d84e643f9d2cec5b0fe2535d28ae93508cf25a71fe4bb74a3c43667c0
 EBUILD mesa-18.3.6.ebuild 13676 BLAKE2B e8a93f9464320ad1850c7d5c998b02af5186f7d6d979cdeba6886fd81b9019cb8dfd0d0bb3c93cc4e89cbb53ed5d99e39e0371a51aab2ccdff47e6d3dfdc6530 SHA512 0f2c7720aab901b185f1fbfe5062ccaa1b387cb60cfb188246840d070494192963ab85363e21e9b0d8db72582a70f55787dbdcff855c13a4b8286af3175b1a98
 EBUILD mesa-19.0.0.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
 EBUILD mesa-19.0.1.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
+EBUILD mesa-19.0.2.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
 EBUILD mesa-9999.ebuild 14170 BLAKE2B 39bea99ece39ed5279157b26612b92538256573f69c6b2ff5effeeadb97efa887c2b1508b5f93d26ad6ecf8e13a69140e131c8759a7f99507b5529fcf4b40222 SHA512 dd690bad043d17860c7aad28a246866082e764d7ff0f521361fed175ef5fc87a8e49bf5d08cd09ca49c8ab2bc0bb4dd2bdfa1677bb39f34c5863040321781b05
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.2.ebuild b/media-libs/mesa/mesa-19.0.2.ebuild
new file mode 100644
index 000000000000..f3f7b57f517d
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.2.ebuild
@@ -0,0 +1,525 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic 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_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index deb0d6f9a9c6..aacd3a82f2ec 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -2,6 +2,6 @@ AUX ming-0.4.8-CVE-2017-8782.patch 772 BLAKE2B 4425c357155b1a57b6498ffcc31119408
 AUX ming-0.4.8-freetype_pkgconfig.patch 2146 BLAKE2B df8c56a04cfe5d0a264402ce5636853ea53c4376999077405355ad112503e82d1b346d7219eafad3689e93a2ac66f89f9ca5f9ad03c564c76571a1919c00e9d2 SHA512 f40ccdc5b97b847ff4bffbdc6a691db8627bbf85f97089e55214f19b34f098ddf0b7eb1a65d1fdc220cb9fb90f89f7fdfa78e44b5d10de872706451be89647ed
 DIST ming-0.20181112.tar.gz 14889061 BLAKE2B a276f7aaf386f0233b9e92a95daf22b7fd192654275e99f70106b7abf2ec3963ae8d70a82addd2690e6c7038a0a52e41a27fbd5c9b38cc96d1ab617a3bfc522d SHA512 a4d3ed04c96ffc6d040ace3451f2d99a3fdda0726b45cee30913ca2dc8d9f24ff156a643eeb888d05eb199dd9f2caf4ce4f84fe40e1b95bf2f6c9e038155fdc3
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
-EBUILD ming-0.20181112.ebuild 2239 BLAKE2B 8cf8f87bb53afe6b0c40c6fb45f8874ed718d6c03534fcbb973040dbf6b4c4ef943ad1d01e4c1edbf792f5eca9ab9ec16d9cbe2b98f19ad1dcb731b621d957d0 SHA512 bf252dd9a8752fd3f14c79ba38702d228f30830bebac8fc00c428a6f7362b813c476bebf1d2855a259f14eef7d4ae65b00a2bb36a22791bd8e829a5bfc79047b
+EBUILD ming-0.20181112.ebuild 2237 BLAKE2B 30b8a9287be1b099b2f4bcae8f5fa071904946b44ecefdf8d61b7bc93e3fd190997304d1c2dcc1f70837673de027d44ce9235b94efde639782e3832b21590788 SHA512 b37b671507e5966bd08b199635c9bddeac19ce439871a667166ada81cac0238acf4c3af3d0004ce8e80962daef95bf17093990f6cbf154dbed2841966b34b96a
 EBUILD ming-0.4.8-r1.ebuild 2257 BLAKE2B c6134cd272270764346d8fe80ae1897ad9353a131ade67d820c4fa4f1a3dd525b4a12851c79a357daaa83c52a84b8fa82eace830836b9d10c061880708cdb90f SHA512 2c7a0af6e4792d9ffce756dac6416432543912fd86bb1c7552b3d67fedd7968a19c971a6db7ea24707d73e2970af43469678d76c0097c83e9c53c00ec1eff1aa
 MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild
index b1eca1fd9e6d..8ae7ffd72353 100644
--- a/media-libs/ming/ming-0.20181112.ebuild
+++ b/media-libs/ming/ming-0.20181112.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+perl php +python static-libs"
 
 RDEPEND="perl? ( dev-lang/perl:= )
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 877bf35f5d30..e2d0242a8eb5 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,9 +1,12 @@
 AUX openjpeg-2.3.0-fix-disable-static-libs.patch 868 BLAKE2B c3d72cc6428467388eed401dbb07f3c66a6f53bc1d0f66934a27ec7ab3c47244c026e5d316df67a471e7888207f0128541a9c55221e4a224a788d5844229d208 SHA512 8509b256d01f11f5d9c8317d5def3dff7275ad024c83306fe658d64d42101e69bc82ef65740599e3a596c382d2f2497ef910efb8f648113de09daac793ba074b
 AUX openjpeg-2.3.0-gnuinstalldirs.patch 19232 BLAKE2B efce79a56f389008d6f90ea97319b2b87738fbdb9580d69824817e881e35311e969abf70eafb0694d7b856b039ec7e7305435ecc0ca0d79c2d9b0b87abfd57c8 SHA512 61cd1284b0d69fc42dfb4027c27ffa6573557e662b1ab646293a835b393166723fbe5a77998821a60739af17eb53af6bdc71529860bf217f91be49c076ccd564
+AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
+DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
+DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
 EBUILD openjpeg-2.3.0-r1.ebuild 4215 BLAKE2B 17350556cee3baf31e26d9f1bddf7a42879b088c84cf8fccad099b1316d3eb5fe469b3b7edb6d2828da3171105d873cf5f89285e2d04ea6b4c94bcde356a3b61 SHA512 3007c71e7ae8117f2ca934d0fc022646718d1f39a95fcaed671afe57092ecf40919c3f6fe913128ffee0b195c0f4d946ea319ab33485cae7fe099e21a9c2f12b
-EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
+EBUILD openjpeg-2.3.1.ebuild 4183 BLAKE2B ce5cff3e194e73672461d81da8d509ca85095fabd70cb624c2da6fe2cbd60afd7f06b94580000e98b818b6565886f5ec919d6591d108de1318536af5e6873da6 SHA512 df832956e633a48ff1f5b0d2d8423fb71bc3872451b1b655bb565dd2edff4feb3758bfa7628c35d0a9cc54c78f592f691dbe9b402f9d0ca6af1ae7710a1db283
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..b0b2666c7220
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -0,0 +1,495 @@
+From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.com>
+Date: Thu, 11 Apr 2019 13:10:57 +0200
+Subject: [PATCH] Use GNUInstallDirs for standard installation directories
+
+Raises minimum cmake version by a little.
+---
+ CMakeLists.txt                           | 61 +++++-------------------
+ cmake/OpenJPEGConfig.cmake.in            |  2 +-
+ doc/CMakeLists.txt                       |  2 +-
+ src/bin/jp2/CMakeLists.txt               |  4 +-
+ src/bin/jp3d/CMakeLists.txt              |  2 +-
+ src/bin/jpip/CMakeLists.txt              | 10 ++--
+ src/bin/jpwl/CMakeLists.txt              |  2 +-
+ src/bin/mj2/CMakeLists.txt               |  2 +-
+ src/lib/openjp2/CMakeLists.txt           | 12 ++---
+ src/lib/openjp2/libopenjp2.pc.cmake.in   | 10 ++--
+ src/lib/openjp3d/CMakeLists.txt          |  4 +-
+ src/lib/openjp3d/libopenjp3d.pc.cmake.in | 10 ++--
+ src/lib/openjpip/CMakeLists.txt          |  8 ++--
+ src/lib/openjpip/libopenjpip.pc.cmake.in | 10 ++--
+ src/lib/openjpwl/CMakeLists.txt          |  6 +--
+ src/lib/openjpwl/libopenjpwl.pc.cmake.in | 10 ++--
+ src/lib/openmj2/CMakeLists.txt           |  4 +-
+ wrapping/java/openjp2/CMakeLists.txt     |  2 +-
+ 18 files changed, 61 insertions(+), 100 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ea2424a..1f70226a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
+ # e.g.:
+ # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+-cmake_minimum_required(VERSION 2.8.2)
++cmake_minimum_required(VERSION 2.8.5)
+ 
+ if(COMMAND CMAKE_POLICY)
+   cmake_policy(SET CMP0003 NEW)
+@@ -103,59 +103,28 @@ endif()
+ 
+ # --------------------------------------------------------------------------
+ # Install directories
++include(GNUInstallDirs)
++
+ # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
+ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+ 
+ string(TOLOWER ${PROJECT_NAME} projectname)
+ set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+ 
+-if(NOT OPENJPEG_INSTALL_BIN_DIR)
+-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_LIB_DIR)
+-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DATA_DIR)
+-  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-
+-if(BUILD_DOC)
+-if(NOT OPENJPEG_INSTALL_MAN_DIR)
+-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+-endif()
+-
+-if(NOT OPENJPEG_INSTALL_DOC_DIR)
+-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+-endif()
+-endif()
+-
+ if(NOT OPENJPEG_INSTALL_JNI_DIR)
+   if(WIN32)
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
+   else()
+-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
++    set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
+   endif()
+ endif()
+ 
+ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+-  # We could install *.cmake files in share/ however those files contains
+-  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+-  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
+ endif()
+ 
+ if (APPLE)
+-	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
++	list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
+ endif()
+ 
+@@ -339,14 +308,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ )
+ 
+ #-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-if(BUILD_DOC)
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+-
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-endif()
+ 
+ include (cmake/OpenJPEGCPack.cmake)
+ 
+@@ -363,14 +324,14 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+ #
+   if(BUILD_JPWL)
+   # install in lib and not share (see multi-arch note above)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JPIP)
+@@ -378,7 +339,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ #
+   if(BUILD_JP3D)
+@@ -386,7 +347,7 @@ if(BUILD_PKGCONFIG_FILES)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
+-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+   endif()
+ endif()
+ 
+diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
+index 2925108a..702e2790 100644
+--- a/cmake/OpenJPEGConfig.cmake.in
++++ b/cmake/OpenJPEGConfig.cmake.in
+@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+ 
+   # We find a relative path from the PKG directory to header files.
+   set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
+-  set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
++  set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
+   file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
+ 
+   get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index d4f3ddbe..ed5cb44c 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
+ 
+   # install HTML documentation (install png files too):
+   install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+-    DESTINATION share/doc
++    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+     PATTERN ".svn" EXCLUDE
+   )
+ else()
+diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
+index 4d4bd952..29b4dd20 100644
+--- a/src/bin/jp2/CMakeLists.txt
++++ b/src/bin/jp2/CMakeLists.txt
+@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+   if(OPJ_USE_DSYMUTIL)
+     add_custom_command(TARGET ${exe} POST_BUILD
+@@ -83,6 +83,6 @@ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+               ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ #
+ endif()
+diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt
+index 3cac1a8f..ed62b4f3 100644
+--- a/src/bin/jp3d/CMakeLists.txt
++++ b/src/bin/jp3d/CMakeLists.txt
+@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress)
+   # Install exe
+   install(TARGETS ${exe}
+     EXPORT OpenJP3DTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
+index 301d885b..ddd867dc 100644
+--- a/src/bin/jpip/CMakeLists.txt
++++ b/src/bin/jpip/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c)
+ # Install exe
+ install(TARGETS opj_jpip_addxml
+   EXPORT OpenJPEGTargets
+-  DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++  DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER)
+   # Install exe
+   install(TARGETS opj_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endif()
+ 
+@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c)
+   target_link_libraries(${exe} openjpip)
+   install(TARGETS ${exe}
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+     )
+ endforeach()
+ 
+@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   else()
+     # opj_viewer (simple, no xerces)
+@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
+       )
+ 
+     install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar
+-      DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+       )
+   endif()
+ else()
+diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt
+index 5df225de..8a798e61 100644
+--- a/src/bin/jpwl/CMakeLists.txt
++++ b/src/bin/jpwl/CMakeLists.txt
+@@ -57,6 +57,6 @@ foreach(exe decompress compress)
+   endif()
+ 
+   install(TARGETS ${jpwl_exe}
+-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
++    DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
+   )
+ endforeach()
+diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
+index 5d3e288b..6669c502 100644
+--- a/src/bin/mj2/CMakeLists.txt
++++ b/src/bin/mj2/CMakeLists.txt
+@@ -43,5 +43,5 @@ foreach(exe
+   endif()
+ 
+   install(TARGETS ${exe}
+-  	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})
++    DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endforeach()
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
+index b2714858..9cbc4c3f 100644
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_regular_expression("^.*$")
+ 
+ #
+ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
+ 
+ include_directories(
+   ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
+@@ -114,21 +114,21 @@ endif()
+ # Install library
+ install(TARGETS ${INSTALL_LIBS}
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjpeg.h opj_stdint.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
+ )
+ 
+ if(BUILD_DOC)
+ # install man page of the library
+ install(
+   FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
+-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ endif()
+ 
+ if(BUILD_LUTS_GENERATOR)
+diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in
+index 62159b00..ebad9578 100644
+--- a/src/lib/openjp2/libopenjp2.pc.cmake.in
++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp2
+ Description: JPEG2000 library (Part 1 and 2)
+diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt
+index b0469af1..6e251984 100644
+--- a/src/lib/openjp3d/CMakeLists.txt
++++ b/src/lib/openjp3d/CMakeLists.txt
+@@ -34,12 +34,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENJP3D_LIBRARY_NAME}
+   EXPORT OpenJP3DTargets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ install(FILES openjp3d.h
+-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
++  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+   COMPONENT Headers
+ )
+diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+index e9b6c404..866a0174 100644
+--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in
++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjp3d
+ Description: JPEG2000 Extensions for three-dimensional data (Part 10)
+diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
+index b3cb8ce8..aace36d4 100644
+--- a/src/lib/openjpip/CMakeLists.txt
++++ b/src/lib/openjpip/CMakeLists.txt
+@@ -74,9 +74,9 @@ endif()
+ # Install library
+ install(TARGETS openjpip
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+   )
+ 
+ if(BUILD_JPIP_SERVER)
+@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
+     PROPERTIES COMPILE_FLAGS "-DSERVER")
+   install(TARGETS openjpip_server
+     EXPORT OpenJPEGTargets
+-    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++    DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+     )
+ endif()
+diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in
+index 7c3f29af..4cfa6fce 100644
+--- a/src/lib/openjpip/libopenjpip.pc.cmake.in
++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpip
+ Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
+diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
+index 1b33adbe..bb90c87c 100644
+--- a/src/lib/openjpwl/CMakeLists.txt
++++ b/src/lib/openjpwl/CMakeLists.txt
+@@ -58,7 +58,7 @@ endif()
+ # Install library
+ install(TARGETS openjpwl
+   EXPORT OpenJPEGTargets
+-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
+ )
+diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+index b1244197..8acc1457 100644
+--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in
++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+-mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
+-docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
+-libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
++mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
++docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpwl
+ Description: JPEG2000 Wireless library (Part 11)
+diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
+index 25294b20..dced53f6 100644
+--- a/src/lib/openmj2/CMakeLists.txt
++++ b/src/lib/openmj2/CMakeLists.txt
+@@ -53,12 +53,12 @@ endif()
+ # Install library
+ install(TARGETS ${OPENMJ2_LIBRARY_NAME}
+   EXPORT OpenMJ2Targets
+-  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   COMPONENT Libraries
+ )
+ 
+ # Install includes files
+ #install(FILES mj2.h
+-#  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
++#  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
+ #  COMPONENT Headers
+ #)
+diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
+index eb3da0ed..4504da5f 100644
+--- a/wrapping/java/openjp2/CMakeLists.txt
++++ b/wrapping/java/openjp2/CMakeLists.txt
+@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL
+ )
+ 
+ install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
+-  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
++  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
+ )
+-- 
+2.21.0
+
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
deleted file mode 100644
index e447db85d6a1..000000000000
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-# Make sure that test data are not newer than release;
-# otherwise we will see "Found-But-No-Test" test failures!
-MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
-
-DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="https://www.openjpeg.org"
-SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20170814.tar.gz )"
-
-LICENSE="BSD-2"
-SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND="media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || die "Failed to rename test data"
-	fi
-
-	cmake-utils_src_prepare
-
-	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
-	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
-
-	# Install doxygen docs to the right directory:
-	sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-		-DBUILD_TESTING="$(multilib_native_usex test)"
-		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
-		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
-		)
-
-	cmake-utils_src_configure
-
-	if use static-libs; then
-		mycmakeargs=(
-			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
-			-DBUILD_TESTING="$(usex test)"
-			-DBUILD_CODEC="$(usex test)"
-			)
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		elog "Cannot run tests for non-multilib abi."
-		return 0
-	fi
-
-	local myctestargs=
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
-
-	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
-
-	echo ctest "${myctestargs[@]}" "$@"
-	if ctest "${myctestargs[@]}" "$@" ; then
-		einfo "Tests succeeded."
-		popd > /dev/null || die
-		return 0
-	else
-		echo ""
-		einfo "Note: Upstream is maintaining a list of known test failures."
-		einfo "We will now compare our test results against this list and sort out any known failure."
-
-		local KNOWN_FAILURES_LIST="${S}/tools/travis-ci/knownfailures-all.txt"
-		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
-		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
-		local FAILEDTEST=
-		local HAS_UNKNOWN_TEST_FAILURES=0
-		if [[ -f "${KNOWN_FAILURES_LIST}" && -f "${FAILEDTEST_LOG}" ]]; then
-			# Logic copied from $S/tools/travis-ci/run.sh
-
-			echo ""
-
-			awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
-			while read FAILEDTEST; do
-				# Common errors
-				if grep -x "${FAILEDTEST}" "${S}/tools/travis-ci/knownfailures-all.txt" > /dev/null; then
-					ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
-					continue
-				fi
-				eerror "New/unknown test failure found: '${FAILEDTEST}'"
-				HAS_UNKNOWN_TEST_FAILURES=1
-			done < "${FAILURES_LOG}"
-
-			if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
-				die "Test suite failed. New/unknown test failure(s) found!"
-			else
-				echo ""
-				einfo "Test suite passed. No new/unknown test failure(s) found!"
-			fi
-
-			return 0
-		fi
-	fi
-}
-
-multilib_src_install() {
-	if use static-libs; then
-		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
new file mode 100644
index 000000000000..9140607a0a34
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+# Make sure that test data are not newer than release;
+# otherwise we will see "Found-But-No-Test" test failures!
+MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e"
+
+DESCRIPTION="Open-source JPEG 2000 library"
+HOMEPAGE="https://www.openjpeg.org"
+SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20180620.tar.gz )"
+
+LICENSE="BSD-2"
+SLOT="2/7" # based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1-gnuinstalldirs.patch" # bug 667150
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data ||
+			die "Failed to rename test data"
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PKGCONFIG_FILES=ON	# always build pkgconfig files, bug #539834
+		-DBUILD_TESTING="$(multilib_native_usex test)"
+		-DBUILD_DOC=$(multilib_native_usex doc ON OFF)
+		-DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		elog "Cannot run tests for non-multilib abi."
+		return 0
+	fi
+
+	local myctestargs=
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+	[[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!"
+
+	[[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure )
+
+	echo ctest "${myctestargs[@]}" "$@"
+	if ctest "${myctestargs[@]}" "$@" ; then
+		einfo "Tests succeeded."
+		popd > /dev/null || die
+		return 0
+	else
+		local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log"
+
+		if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then
+			# Should never happen
+			die "Cannot analyze test failures: LastTestsFailed.log is missing!"
+		fi
+
+		echo ""
+		einfo "Note: Upstream is maintaining a list of known test failures."
+		einfo "We will now compare our test results against this list and sort out any known failure."
+
+		local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt"
+		cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die
+
+		local ARCH_SPECIFIC_FAILURES=
+		if use amd64 ; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		elif use x86 || use arm || use arm64; then
+			ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')"
+		fi
+
+		if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then
+			einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..."
+			cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die
+		fi
+
+		# Logic copied from $S/tools/travis-ci/run.sh
+		local FAILEDTEST=
+		local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt"
+		local HAS_UNKNOWN_TEST_FAILURES=0
+
+		echo ""
+
+		awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}"
+		while read FAILEDTEST; do
+			# is this failure known?
+			if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then
+				ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..."
+				continue
+			fi
+
+			eerror "New/unknown test failure found: '${FAILEDTEST}'"
+			HAS_UNKNOWN_TEST_FAILURES=1
+		done < "${FAILURES_LOG}"
+
+		if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then
+			die "Test suite failed. New/unknown test failure(s) found!"
+		else
+			echo ""
+			einfo "Test suite passed. No new/unknown test failure(s) found!"
+		fi
+
+		return 0
+	fi
+}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 98288e78a8c0..933497d4c9ee 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -6,6 +6,6 @@ AUX tiff-4.0.9-CVE-2017-9935.patch 6636 BLAKE2B b7660dee9e379aea59f7225024697ea3
 AUX tiff-4.0.9-CVE-2018-5784.patch 4251 BLAKE2B defd555ebc53e178439331cd04f3099c4ad77584efd0a4312802307ce90828e63513df738e992905af824f25d987d43e095d313d359c3de9eebba5bf4c843bf1 SHA512 ebff45d1ecc1fb783f806eb556ccb01316289e190786378309a51a0c4d10b53ae6c86a1310ea59bc79946e633163916700e17752d0a7add10c22b8824b000b7b
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
-EBUILD tiff-4.0.10.ebuild 2316 BLAKE2B 2f0286d0d8f8df44b3ec27b2ee2c36d3311a1d7e5d34009187699bc15a34a5e96d3b3342963defc77fac4360971512c8a682467ca9c856f190412f372d58fa52 SHA512 4c77a41c79538573ac859bad697be189bbce74c5ad18a0af3a55edac56cabff2ce04e3874fac188c9211d981acaaf104e2ab43b966aabaa82d72c8bda9e7ca2c
+EBUILD tiff-4.0.10.ebuild 2315 BLAKE2B f86440ee25592b4ac1ee716331851f4c5c980d482a4863a1cdb217dd0879840c453418844b70ff11911bdf53f177891bcd0d3ed0a504d3e26d4da1b91d61956d SHA512 14007e705a7c574daf66bdb1555cb03ba46098ff150295a92f3668eb6ded20780211e4c6c315329e191fd322bebb38e4d708649ff811e5c3576120b7898bdce2
 EBUILD tiff-4.0.9-r4.ebuild 2354 BLAKE2B 272c6c559ca76d81689caefa8dbd66aa22b8e29fd2cf35ba0699abaf2e85fa1f542237c9eb3b85735921617b76790bdbaede55b0c113a7cc2d35b192d3821e85 SHA512 ee3c1ab75d4694bce0e9523394ed0bf9daca1de6bc276199d96b655192a59f72ddc4bbbc7981e26c6f44531da334bbaab94fb9fa72191d6c241e861b71e78e4b
 MISC metadata.xml 640 BLAKE2B faec0c1b8ddc13c849f3814532d7886a7b1fcc7aee14eb1ff26dc0265d51bd7516c779e2dba8e9dc8c1116f3be46db6dd06bfe46dd4b5dc3300f29b402bb666a SHA512 9445f36944e1018afcb83e3f5d9382d8e91d52924171786a40606ab46bfe0c0de744b40fc2adb58ece5d0168bca967d2bef73de05a81cd46615bd50502d08a29
diff --git a/media-libs/tiff/tiff-4.0.10.ebuild b/media-libs/tiff/tiff-4.0.10.ebuild
index 1694f10426b9..08a0eb66b207 100644
--- a/media-libs/tiff/tiff-4.0.10.ebuild
+++ b/media-libs/tiff/tiff-4.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~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"
 
 RDEPEND="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 5c193719e55d..967ab870ff5d 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 4c6f2e583506..1b70c13a85a8 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -3,12 +3,14 @@ DIST kodi-pvr-nextpvr-2.4.13.tar.gz 111692 BLAKE2B 5199c9fb8b767eeaf116ed87abafe
 DIST kodi-pvr-nextpvr-3.3.11.tar.gz 119455 BLAKE2B 1a1eaedaada67267ac63776e0ff4c668a6f2484c73e37ce94cc825ac07507fec3a4d4970b556bff1ab8a0a74231b38525773492b91cd4ed4bba98b213a15b9ea SHA512 145c71c0eeb7b9cea03b1fa1c4c18f6b69e6d775519e1565160efd32a38642eb351b608fb54f285281a36ee4841e8242e1ff7c2aa384dbee17dabfe8ba13bd65
 DIST kodi-pvr-nextpvr-3.3.12.tar.gz 119592 BLAKE2B 6522790e6bb6dabecd010d34fdd1ee9590b541e8fd5a539f586cb81635f5f3729f813514355306042180e7482d0e1c350639d285ce591fc1c35d560e50f903e2 SHA512 bda38c256a9d49f72ec6c8ac9942670942edd8ac095c5f6eee120f52189a9d5466c28f2a7dcb525987da5df05d5ebc4e3b2d93778807370c8d16ac936c616293
 DIST kodi-pvr-nextpvr-3.3.13.tar.gz 127574 BLAKE2B c2460352ce24099553a2610002bfb499555bde180d557dd19fcfd905bd4a38ddf7c6f9cc4e53636287197690b778eaf74afafb78c44fab1cb24a20df709e6648 SHA512 b75bd7d127e3e3f4e103dc9dfd3f681706c298c1d216904c0c0088cf8a02301b3dcaee0d0dd976568c14be59c78e8d98a60d0806465b08f130452c52cdb836cc
+DIST kodi-pvr-nextpvr-3.3.14.tar.gz 127995 BLAKE2B bacf139b2d7338db08016cc81e66cad1716c686d3f45b71612a591a00653457a47964e6e08727da0fe39da09dcaf643f9da529288a9c6e42db3343842e9a7050 SHA512 6da83088f652710363d7bd37f38328ec364e5313168a6a2c624b34c3276eaf99223d28eb8a2bd90a4e68fa0669aa974fccf979e5bf7a6e61a8b8262c954896c4
 DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
 EBUILD kodi-pvr-nextpvr-2.4.11.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-2.4.13.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-3.3.11.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.12.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.13.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
+EBUILD kodi-pvr-nextpvr-3.3.14.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
 EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B 9bfe109a644ca55ceadedcbbb6cd8a48679afd67ffd9128eccbe9081bcf611aa5da06f1ec3b3d0d2bc59b279f2c8bbc90aa7e0b190868dcadb622625a60e4596 SHA512 dfe5613b50d14ab632d80dda8041ec11f7a7bf5996a8cd824b56f51490f9fc1678ef914f68f9e2f4f58def0af50f23d143069d622cc3b861e97d1c6cfba97294
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild
new file mode 100644
index 000000000000..be53994bd0ff
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 8440398b0a75..eb33138ca365 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index c508d7fadb99..375b065c7ab2 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,7 +1,10 @@
+AUX wsjtx-2.0.1-hamlib.patch 479 BLAKE2B 6c77f178ab0aab9519c8e356d14f1d6050545e10d2bb2c25686afa1844107c5ddd86c9696ca1a9d8812e0c8a2194e23649ae02322555b7b9fc67f7e12a9fd623 SHA512 753b4c832f0cb442cbde73597ed5b9305e68328cb0fa69972d43be3bca480de6dab9e04906fad07abc431292bca4b0081ab65406e27e5bb688418a147e27afee
 DIST wsjtx-1.8.0.tgz 29041865 BLAKE2B 3eb3d4e2711443a9e895c1b5771ae6378b13cccbe9b50dce97e9551218700a4e22ae10b618e346b52d2037ee26c5d41f1cf2376d8cc19d143d263db5c683a482 SHA512 793e88604661b03e2e6d5a910ea4045f800b9c59174af3286fd8afdaf65d8a3ca7d1aeae557c6afc66d9bbe398be8c7030950dda03d6bc6279061c3a3107beaa
 DIST wsjtx-1.9.1.tgz 29264406 BLAKE2B 0eb00737851a7877d894a21218c6a408eac30caa4114a0edd69400701f0c8c702d4c373adc5c9f7896a4d8f96c338a92e0a997e0270240917b5e236db36c9aa0 SHA512 16c84e7bb8cf9e6eff288b74ee1f9083e0133ff69fdefca7fbc986c912663f744a75db353242024fe8c64ff9e6e8558fd825b9b106abf02cdd4b43be91680557
 DIST wsjtx-2.0.0.tgz 42090145 BLAKE2B 8a439dc37daaa7e989dc1cbe007a9493268e2590282f1d88781f8f8bc40690511533a0c668654ada81a0504af880eb7d361b305ca523fc432603eafdcccc88eb SHA512 9cbda699345c4e18ae450415701700f19219f81b75080abf04a9136e40017d7113dd099bdff44414a1f0060c8687e46d6df2dd5cd15730c98eed36f9765ef82d
+DIST wsjtx-2.0.1.tgz 43779157 BLAKE2B ecebc4020ff6d095f550aafda59ab1b7de197dbbec2c0278fa00a3f30cb63bd41ebfe135ed4f2583953e4d895b2a93ae3fb474977945bec5922650c0bfc060c2 SHA512 c49a2148b009c1f485fb0a775708f248a7d3b7c0d240879fbd0ffd18e0181c6573b63dec96137ab6643314ff0e0b10661914400c877901475b0ebaba4569b297
 EBUILD wsjtx-1.8.0.ebuild 1108 BLAKE2B 2fd3b590d9c0aa4591d0387d504f74b8aeb77240546fb44a921781784f9018cebff72fffa1030cd718fe656ab87fc909e463ca576b0147705959c4330e0ff83c SHA512 3b4f9c93027d81c00cb1bf112f01fb67fe25738c6f738f3c2cd5c162b13e2e87b4ae1352d3796fd913e94226b809f8c2904adb45e334c57c650d6fd3d5b16c5c
 EBUILD wsjtx-1.9.1.ebuild 1109 BLAKE2B b535dab45720a8e8fbded73f9a3588c646cb97dc85a0fb9cc3a60915b0e6cfebed69a6175fde38c6f9cdf51ced49955b5583fdc1c387930ff215d6f7e4c1647d SHA512 10b4488f2ca1ea778b03f212bfa5cc133da1168a22b8bba63160492f6ec09c3bf971baad310d053ba803afd6441cbb9cda985aa1c00d50c032a7cffc7241f80e
 EBUILD wsjtx-2.0.0-r1.ebuild 1218 BLAKE2B d7fc133d80b9f6643f8fbe5b07a9c95d8bbd614766afcbdeb1959e6f641e1239c7b50ca662d32ed13bff6c0d2e5d630807ea1a65ba0ea1332114844afacc2f3c SHA512 9fb29b0d3d446a780a8c6ee7adf6c5224e3f082adfe66d01e77d95c8884ebfead5d0319f469fd8dcfea2ba811f620d2d5293f25aa78afd9df22032097f8cf56a
+EBUILD wsjtx-2.0.1.ebuild 1263 BLAKE2B 14282820ed4dc26bcd98fdefc49416831775fff8c26d1a52268f600d72e7c51077a0b630257d9e5b8c3920cd612616f33aa0bdadd290959e612c6001ec55de5d SHA512 9a4c107ec4f6e43f07343565e239a41cbd04a6fd9e44f40bbd8aa4087b32f0944f1ac75aaa33a55fbb29e158fa6a44dbb5f154fd2648a535d934a02a2ecc4327
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch b/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch
new file mode 100644
index 000000000000..88fcc08f6581
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch
@@ -0,0 +1,12 @@
+# use only installed hamlib version
+--- a/CMakeLists.txt	2019-04-10 15:47:58.372519159 +0200
++++ b/CMakeLists.txt	2019-04-10 15:48:07.576949145 +0200
+@@ -848,7 +848,7 @@
+ find_package (hamlib 3 REQUIRED)
+ find_program (RIGCTL_EXE rigctl)
+ find_program (RIGCTLD_EXE rigctld)
+-find_program (RIGCTLCOM_EXE rigctlcom)
++#find_program (RIGCTLCOM_EXE rigctlcom)
+ 
+ message (STATUS "hamlib_INCLUDE_DIRS: ${hamlib_INCLUDE_DIRS}")
+ message (STATUS "hamlib_LIBRARIES: ${hamlib_LIBRARIES}")
diff --git a/media-radio/wsjtx/wsjtx-2.0.1.ebuild b/media-radio/wsjtx/wsjtx-2.0.1.ebuild
new file mode 100644
index 000000000000..72bc67c88b13
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.0.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/hamlib
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/wsjtx
+
+PATCHES=( "${FILESDIR}/${P}-hamlib.patch" )
+
+src_unpack() {
+	unpack ${A}
+	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DWSJT_DOC_DESTINATION="/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
+	rm "${D}"/usr/share/doc/WSJT-X -R || die
+
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index adb9c302b9f8..b8319a4c291b 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 3c489b89ae3c..32f3b15be887 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,9 +1,5 @@
-AUX 3.28.2.1-appdata-test-fix.patch 1102 BLAKE2B a4af513d38152b19f4dfd1e40ded23b5ba6b270f266dd789db423527c298edba5e44ba8a68761d0421dcafbe131fd7ae0701b35a50b2e71950efc3c0f073073a SHA512 4b666a47fdde5410c15e0488e772425f572aae3d9f621180f930991db4b291d8664486afa2cd3a48bc2da73c3c8152ac6653aa68e91bd7feafb050092cb905fc
-AUX 3.28.2.1-icon-fix.patch 943 BLAKE2B 49731d14897e5ce6ca10addb90a63361eb127e64be46ec672852df7a1221c1843c174263881ff714432341dac0f56d1a09772d8a42c67da2e981b6e144f97641 SHA512 5a07e984bc6132439b5c1b20dc36fe2b8cdb42ab84bee876c750f02bf2f97a4302d16547e38da0249e4596ea5431ddc212b36d392ab8657d9eb2482a46f3772b
-DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
 DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
-EBUILD gnome-music-3.24.2.ebuild 1600 BLAKE2B b557c83509fa13fe33fea28b1938fe55b898ab056cf18a06ed01cab765474b28d2e2264be63b90056516e5e9cda41e2976116ca14ecf8ae2168288edf38d46b5 SHA512 36233e11a15d7c4a26a077f146d805f9ff971851816e1bb2be624aa3ab73d3f6c02f9029da5020163b7c00e67bc509d39cc45d887dc10bd47c0c7229e18b97cd
 EBUILD gnome-music-3.26.2.ebuild 1628 BLAKE2B 3c494b1bb202508f8548b21d336b688e79901ffeb4296aabb8bace6a97c8dc93e99ab85146f4bed39da273c78a62f87fae0800c3e13d1e0f83684ad44d743b0c SHA512 78f3b1f3a2bda05c5f1a5e81a941f9478dd292e89721af1c9ebaebf73196891b664674256fecc96588d98001cce4ce64cbce2099bd42d7076dbe421ab099a53c
 EBUILD gnome-music-3.30.2.ebuild 1934 BLAKE2B 6272d666d847d9c970e5e8352afa10980a2fb2387a5d64aba830bef9c8543ed3d6d60f771d1338f488831b6da16a801ac7a7334fa1b81027eeccc9f5259b5796 SHA512 9d3ab939cdc919ab2181ceeccbc4b61d6ceb50776a712e40c08d1fad4007dd1602c44ec111f6bca4f03a87e940d9af58a72836475d8ec8abe63f83443d7cba90
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch b/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch
deleted file mode 100644
index edc06b2cf2bb..000000000000
--- a/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0fc9bee85ab994043e1c5365d665fe51c95cb047 Mon Sep 17 00:00:00 2001
-From: Nick Richards <nick@endlessm.com>
-Date: Tue, 31 Jul 2018 18:09:09 +0100
-Subject: [PATCH] appdata: Reword description
-
-Use the appdata description to list the available features and try to make the copy more inviting
----
- data/org.gnome.Music.appdata.xml.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.Music.appdata.xml.in.in b/data/org.gnome.Music.appdata.xml.in.in
-index 999236e0..6e8295c5 100644
---- a/data/org.gnome.Music.appdata.xml.in
-+++ b/data/org.gnome.Music.appdata.xml.in
-@@ -7,7 +7,10 @@
-   <summary>Play and organize your music collection</summary>
-   <description>
-     <p>
--      Music is the new GNOME music playing application.
-+      An easy way to play your music. Automatically discover music on your computer, the local network and internet services.
-+    </p>
-+    <p>
-+      Find tracks in your local collection, get music from DLNA servers or try something new with the Jamendo and Magnatune services.
-     </p>
-   </description>
-   <screenshots>
--- 
-2.17.0
-
diff --git a/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch b/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch
deleted file mode 100644
index 5a69a86d3d82..000000000000
--- a/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 39e03f574c34e89b8ee9aa07ea5a2f7a595ecc20 Mon Sep 17 00:00:00 2001
-From: Marinus Schraal <mschraal@gnome.org>
-Date: Tue, 8 May 2018 11:51:36 +0200
-Subject: [PATCH] window: Set correct default icon name
-
-With the switch to Meson the default icon name is now org.gnome.Music.
-Fixes the icon not showing in gnome-control-center.
-
-
-(cherry picked from commit eeea5f41b9a9f7e716f9b95dddfe2d151a06f06d)
----
- gnomemusic/window.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gnomemusic/window.py b/gnomemusic/window.py
-index 956d7ab4..66131d72 100644
---- a/gnomemusic/window.py
-+++ b/gnomemusic/window.py
-@@ -77,7 +77,7 @@ class Window(Gtk.ApplicationWindow):
-         self.add_action(select_none)
- 
-         self.set_size_request(200, 100)
--        self.set_default_icon_name('gnome-music')
-+        self.set_default_icon_name('org.gnome.Music')
- 
-         self.prev_view = None
-         self.curr_view = None
--- 
-2.17.0
-
diff --git a/media-sound/gnome-music/gnome-music-3.24.2.ebuild b/media-sound/gnome-music/gnome-music-3.24.2.ebuild
deleted file mode 100644
index b4e919cf824d..000000000000
--- a/media-sound/gnome-music/gnome-music-3.24.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-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 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/tracker-1.11.1:0/100[introspection(+)]
-	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=media-libs/grilo-0.3.2:0.3[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	>=x11-libs/gtk+-3.19.3:3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		app-misc/tracker[gstreamer]
-		app-misc/tracker[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	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
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.26
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf needs app-text/yelp-tools
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"usr/bin/gnome-music
-}
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index a1b87169162e..6f960f3efc2d 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,4 +1,4 @@
 DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
-EBUILD lmms-1.2.0_rc8.ebuild 2381 BLAKE2B af03643f06d4acf0e20617111c6b72924ec3f3bdca9b597b6ffb2eef5a4d4baeb9d0a1f66975dcd22b4d959d919e0f668e4fc264bcbc4955c74fc2bfb7134719 SHA512 22555ba14f36692c389358b917e01d764d948fe0301a70353ec5bce7ea992e65cc23f0f88b0e355800cb5149dcc1fd51865c472f0f2ad3e40af95209d1a6c575
-EBUILD lmms-9999.ebuild 2289 BLAKE2B 6478c818d455f024f2ca2a6990c7966037250441ea0870e16bb18a6ac5a87609e473bd416ca6d6cfa50862ff65a1b4c2692f5fa5c1cfc8e8acc7c6b1bc7de92e SHA512 3210450792654040d75011816237a9f3ff6b06b32dade0c9614a6b6077d852fb0e7c080b28913dd90d2c2b46ea27b3eb780c557b1d0c87fe4fe649747fa0e17e
+EBUILD lmms-1.2.0_rc8.ebuild 2404 BLAKE2B 4327d8dcf22d9a6d170843235fde5f96bb6d0630332459da4a3b3ed636ce984d42e8c46cdfd210571443ab9adf1c9c1694da8d1cb4f5654791133f3df5605371 SHA512 cd71131d24ff78b0cbb8bf039dde1e24d206e91787782bf6e2e23d9f8028188ea0fd675eff630a9372f3199b88445048de4db42242f06343e19a6a33bd7d71a2
+EBUILD lmms-9999.ebuild 2312 BLAKE2B 4ff386189219b087a28849b5eaa9821705b9e58497206a0e1d29ed4d2a67893b222562ad36e85c6e62569c1689efe7d10c0bd01cf3a6cf118ed9526e90b871ae SHA512 e2880190ea5731e948b72b4a1f2d06f6992486f7e0d3b7a521d2723b070e611143d686b37fe43f110b52cdf40a16f9a08fb6938915b80cd27b256ad7869894db
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0_rc8.ebuild b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
index 2827a9620b2e..60e4c62c671e 100644
--- a/media-sound/lmms/lmms-1.2.0_rc8.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
@@ -54,7 +54,9 @@ COMMON_DEPEND="
 	stk? ( media-libs/stk )
 	vst? ( virtual/wine )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtx11extras:5
+"
 BDEPEND="
 	dev-qt/linguist-tools:5
 "
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 4fddbf9d2960..66d6fbe1e437 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -52,7 +52,9 @@ COMMON_DEPEND="
 	stk? ( media-libs/stk )
 	vst? ( virtual/wine )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtx11extras:5
+"
 BDEPEND="
 	dev-qt/linguist-tools:5
 "
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index c8f6c225d2f5..a9a2d5151129 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,6 +2,6 @@ AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69
 AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
 AUX mp3info-0.8.5a-tinfo.patch 195 BLAKE2B b8b25093c6b320d5f635d35b958699072d13498e93921dd7221aa0c5454deaf3ae77fb4a7d5fd7aeaea0a27b2d1737c22749c8a326fd8d9af52aeb5fb1584e92 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653
 DIST mp3info-0.8.5a.tgz 127482 BLAKE2B 303b7fb798604693c58e6412e5e282fbfb1ae126166a7c3d12c335953669c6e8482fb287313d6f44fb802545d728a58ae5f58c4e25bcea1d530879fe87910577 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2
-EBUILD mp3info-0.8.5a-r1.ebuild 928 BLAKE2B a9c51817beec1c3fea440ca69451bf0d0de7861ae4852a5aa84e1b7307b95696318d100c7465ab3264b3ba2094fb6fdc6381da5c6e6263cddadec26e4b653790 SHA512 fbb0f423d8e502f722629be888e03759b981f689fa1df21f9318d10f54eec6b6eb694c2b05eed8e9d26cec68f3b211b2d0bfb9b77cd5687ec8239a8bafebce53
+EBUILD mp3info-0.8.5a-r1.ebuild 927 BLAKE2B a7faefe420a7493931d94b469b305db1bd7d7fa228f949908fd30b1114ef78073b223b82c5cdfca40352d75547e71f80121ab1f012d4dcb4b889178175717c8d SHA512 1cf7636c1d67720e45bd925b2164e644a53e8b4b311a54ce963d0e8ec821ef3aa4b7f34c902facb7be9ce3d35b402bed1480a7db6d7f45d70b6feea767ad2b51
 EBUILD mp3info-0.8.5a.ebuild 901 BLAKE2B 3db0a926a9e7b8f26778f0a9cfcd5a7b019c4b966ff6f23684343463810ce4f5f9ace1896ddc52cef1c35fc2e633462e1a11e5365b1b5bf58ccfb6413d0cfc5e SHA512 3ea667a13f1b618a7370686b9d2b0e184a3a87677d45c6fe541a25a45bdabcb206f89e244d6fa16b78bff9166dd6588afc702a961d3247714f784edd9fb9abd6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index 5038278e66cb..e027778e9ece 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 67562fda7286..ca415a0251ec 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 a3d3f67e9836..28294eafa631 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Apr 2019 08:08:41 +0000
+Thu, 11 Apr 2019 21:08:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d8bf365d3bad..5bfa207dddf7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 440443 BLAKE2B 9e9d293a3f0dfbc56facd5cab62561a821a4567454fee46ac183dd74e57c741535993dd76ffe192cdc8973b7d2dc28ca1224776f18cbb5782d73b703b6c5f847 SHA512 dbc16fe4c86f30662bf304247a35c5dcd8f3d32b162280579365fbafab3972dcf73264902ff837a913889ef72f6e1dfc7cb2631c40c3d50fe019e58838a0011f
-TIMESTAMP 2019-04-10T08:08:45Z
+MANIFEST Manifest.files.gz 440912 BLAKE2B 9ea8574697c29c79c477a36363f4d2c7b47da71f24d32c0c849b43ce85c6195cd38852f18e3e9f5a67f08e2d69d3d9091663b6da7e2de6a6da8181d5e49cc23c SHA512 9cb4038f89f175ad7d3ff9ca55bdb899358687b385a53ef46218971a23729281d566301e32309e2541593a1f08bdac5dd3cd4b48d7044ca634475e0fe0bfcaea
+TIMESTAMP 2019-04-11T21:08:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlytpI1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlyvrN5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBpDw/9HX0htBfGuAxK+4yuv9ssnDaBSRcfIEmO9Rjxs2Gcu/dHt5jVeEp+sjum
-lBUewVitPsCS+NuytHiy6eeAk4gIijrGCdtxRQcNHSaVTt8g0ATyqWr/KnIfa0WC
-vpZf5TGcGXl5m5MWd5CZ6N+3Gwpn6wyVSCOezGLEW383MclJJnXQB5Q4eLU4+56I
-vJKJLXvSGF19DEDFqNkRpByX5jInQmza/iPSULUDMAIFajUOlnxxqrl+k9tnweqh
-CgtvlA5xbU07pP3Q0PEvchkzDw3qn2Y0USP5KGk4kzr+WtMELe/LKpF1F0bDeLb6
-I/CnPmp9zKZfViAgtoD7r7xcYj0jXB9Pj6g3TVJpdUgMgG7PC6liMfc8TL8rG/GU
-uigaWl6k9hZK+w/HpI7mHtBi9gNM8UVcHT+QpouxFvDf2juFQ50HcUnIlEDYR7xE
-SmigY2e9XUIEUe+rdJbRTfi7BJ4sPi6g2NHHtcbcu5DvEzzX50T3OMhsJdAGWqeZ
-Mc9QNSojuC/KXpMmitT+fBfsFm3obUz1cPtMnRsgERZPJWK1K/1g0W1yHSBGsW4P
-MdeOvgTjltNAVDVQ0JySofZ3Yx/cT55bLx/9ByoKBh/mOE5TgctS3sg29qHzrqpi
-KEM5prM9hTr42qw2lwR0jp+PRs8JaC4Uox5WvyYKu+XDgoq/Bws=
-=/zi6
+klAQnA/+ODVoB2PiA9QDnB5UXkN1/AyLHV8mGrXSQPkC5G+ZKCd6j8P3kErK8UCt
+rpV/AoMqE/dJZxgtnlKmt7UME6gUnCsPKj1lFGheuxUuDPTpfmgdd0ZJrIS7OxAq
+AJJyq4eMw/nnXJouynAjmDRfZmadtvUFhnz175VlUjubG0vlaXvdhW2ZgQa4qwP6
+8e9uip2v2Mb2LewzuskdKMM1W3hcYQ3coHj8TxMamnUOBGaD+ik7PrERrNa/5+Ou
+gfruE/tL22aP0jupFxxIMhvYnEObuyvExcv46yoDEt6jPjxgHP7lczIdzhRPOx+V
+Udtp0PGqW1uZifTv1yKL9shyNOECjIC/18xsHPr/49qG739FSTXMZjvPSk9J/55W
+6CCuT49LSGcSBG8P5yJzsLURJ8sq3viaYHgb4WeNFjnhEQMCzqrit32tbm2lKxqU
+4EOHljxbEM7gXNB6Iapm3KdyycvV114lpPLqBZR9tS8cmnSLfZRu3HLueqDzMZuf
+UiZN8ERgq3YximVVuYyN77hZb0tJVdxlfqtQCTiy8bz9/UA0cWBk75ugt6uLId9l
+R0Hc2eOyrlZ6vo6rYMu7IJvBfaMcuSVcTZ1BJrfjDea4puxcPzEJl4tBzGWAhHGN
+/RQCpU30t8oytDDCYmcv0aAItzk1jKFsqyhYTuXKvcGfeiQcr0o=
+=aIR0
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 539830aa21a3..e5ac698b8fe2 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-201904-11.xml b/metadata/glsa/glsa-201904-11.xml
new file mode 100644
index 000000000000..f6fd170bf78a
--- /dev/null
+++ b/metadata/glsa/glsa-201904-11.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201904-11">
+  <title>Portage: Man-in-the-middle</title>
+  <synopsis>A vulnerability in emerge-delta-webrsync and Portage could result
+    in a man-in-the-middle attack.
+  </synopsis>
+  <product type="ebuild">portage</product>
+  <announced>2019-04-08</announced>
+  <revised count="1">2019-04-08</revised>
+  <bug>646212</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-portage/emerge-delta-webrsync" auto="yes" arch="*">
+      <unaffected range="ge">3.7.4</unaffected>
+      <vulnerable range="lt">3.7.4</vulnerable>
+    </package>
+    <package name="sys-apps/portage" auto="yes" arch="*">
+      <unaffected range="ge">2.3.22</unaffected>
+      <vulnerable range="lt">2.3.22</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Portage is the package management and distribution system for Gentoo.</p>
+  </background>
+  <description>
+    <p>A vulnerability was discovered in emerge-delta-webrsync and Portage that
+      did not properly validate the revocation status of GPG keys.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could conduct a man-in-the-middle attack.  Please
+      review the referenced bug for specific details.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All emerge-delta-webrsync users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-portage/emerge-delta-webrsync-3.7.4"
+    </code>
+    
+    <p>All Portage users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-apps/portage-2.3.22"
+    </code>
+  </resolution>
+  <references>
+  </references>
+  <metadata tag="requester" timestamp="2019-03-24T23:20:15Z">BlueKnight</metadata>
+  <metadata tag="submitter" timestamp="2019-04-08T15:21:14Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201904-12.xml b/metadata/glsa/glsa-201904-12.xml
new file mode 100644
index 000000000000..35d006de1ab9
--- /dev/null
+++ b/metadata/glsa/glsa-201904-12.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201904-12">
+  <title>ClamAV: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in ClamAV, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">clamav</product>
+  <announced>2019-04-08</announced>
+  <revised count="1">2019-04-08</revised>
+  <bug>660820</bug>
+  <bug>667900</bug>
+  <bug>681840</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-antivirus/clamav" auto="yes" arch="*">
+      <unaffected range="ge">0.101.2</unaffected>
+      <vulnerable range="lt">0.101.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>ClamAV is a GPL virus scanner.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in ClamAV. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All ClamAV users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-antivirus/clamav-0.101.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-0360">CVE-2018-0360</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-0361">CVE-2018-0361</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-15378">CVE-2018-15378</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-1785">CVE-2019-1785</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-1786">CVE-2019-1786</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-1787">CVE-2019-1787</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-1788">CVE-2019-1788</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-1789">CVE-2019-1789</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-1798">CVE-2019-1798</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-03-29T21:05:49Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2019-04-08T15:22:53Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201904-13.xml b/metadata/glsa/glsa-201904-13.xml
new file mode 100644
index 000000000000..3c6f7e5af643
--- /dev/null
+++ b/metadata/glsa/glsa-201904-13.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201904-13">
+  <title>Git: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Git, the worst of which
+    could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">git</product>
+  <announced>2019-04-11</announced>
+  <revised count="1">2019-04-11</revised>
+  <bug>671988</bug>
+  <bug>676262</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-vcs/git" auto="yes" arch="*">
+      <unaffected range="ge">2.20.1</unaffected>
+      <vulnerable range="lt">2.20.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Git is a free and open source distributed version control system
+      designed to handle everything from small to very large projects with
+      speed and efficiency.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Git. Please review the
+      referenced CVE identifiers for details
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifier and bugs for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Git users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-vcs/git-2.19.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-19486">CVE-2018-19486</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-03-10T06:15:06Z">BlueKnight</metadata>
+  <metadata tag="submitter" timestamp="2019-04-11T01:14:55Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 71187a58866c..28294eafa631 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Apr 2019 08:08:42 +0000
+Thu, 11 Apr 2019 21:08:42 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 5a96ba10ec70..66703a083eff 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-6bba18b269ddc0e048860525712ace98fa7a8ec4 1554736795 2019-04-08T15:19:55+00:00
+f968e3b69dbac09ac866bb6aa6abb70acbd31a8b 1554945337 2019-04-11T01:15:37+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0a4d81b314ae..33b375a98f6f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 91d6a4a52f1e..0c5ecc7eec31 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/glance-18.0.0 b/metadata/md5-cache/app-admin/glance-18.0.0
new file mode 100644
index 000000000000..e527a1b0e03d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/glance-18.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=Services for discovering, registering, and retrieving VM images
+EAPI=7
+HOMEPAGE=https://launchpad.net/glance
+IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-messaging-9.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/glance_store-0.26.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/glance/glance-18.0.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=7f1a1a91925654e9a848c0f0c9baad95
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.4.0-r1 b/metadata/md5-cache/app-admin/keepassxc-2.4.0-r1
new file mode 100644
index 000000000000..e72278152c10
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepassxc-2.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
+EAPI=7
+HOMEPAGE=https://keepassxc.org
+IUSE=autotype browser debug network test yubikey
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 GPL-2 GPL-3
+PDEPEND=x11-misc/xsel
+RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
+SLOT=0
+SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.4.0/keepassxc-2.4.0-src.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=35d0d3d6ca958a7f23898f8209f09f0c
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.1 b/metadata/md5-cache/app-admin/supervisor-4.0.1
new file mode 100644
index 000000000000..e09211dcb601
--- /dev/null
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DESCRIPTION=A system for controlling process state under UNIX
+EAPI=7
+HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze ZPL BSD HPND GPL-2
+RDEPEND=>=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=4f02931b0e2c2d191bc73c803d7398da
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 7c66fc5b5f35..b5fb84488500 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/lzip-1.20 b/metadata/md5-cache/app-arch/lzip-1.20
deleted file mode 100644
index 473e6b140c1a..000000000000
--- a/metadata/md5-cache/app-arch/lzip-1.20
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=lossless data compressor based on the LZMA algorithm
-EAPI=6
-HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.20.tar.gz https://download.savannah.gnu.org/releases/lzip/lzip-1.20.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=868d29c0edd9245fbcda6e28137eec37
diff --git a/metadata/md5-cache/app-arch/sharutils-4.15.2-r1 b/metadata/md5-cache/app-arch/sharutils-4.15.2-r1
index 4084d9dc290c..1c245e986e58 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.15.2-r1
+++ b/metadata/md5-cache/app-arch/sharutils-4.15.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to deal with shar archives
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/sharutils/
 IUSE=nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.15.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff5b5fda5e0fdcda3c8fa593d2dea0b1
+_md5_=960e0586c4c7d0b939a9081031df2f52
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.7-r1 b/metadata/md5-cache/app-arch/zstd-1.3.7-r1
index 02c8749be840..beaf907fca67 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.7-r1
+++ b/metadata/md5-cache/app-arch/zstd-1.3.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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.3.7.tar.gz -> zstd-1.3.7.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=84c121ecc03d6c930e3f6cbd9b413b0a
+_md5_=7bb85472d8a6ff34af0c794427ca6e2d
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 91cce1d65605..3616ac67b92c 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/cdemu-3.2.0 b/metadata/md5-cache/app-cdr/cdemu-3.2.0
deleted file mode 100644
index 3ba9ed8d46b9..000000000000
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Command-line tool for controlling cdemu-daemon
-EAPI=6
-HOMEPAGE=http://cdemu.org
-IUSE=+cdemu-daemon python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cdemu/cdemu-client-3.2.0.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4d5fc00008b1b5bb5fb3c3eb4f6a9302
diff --git a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1 b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1
deleted file mode 100644
index a3ba5b17ea24..000000000000
--- a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Daemon of the CDEmu optical media image mounting suite
-EAPI=6
-HOMEPAGE=http://cdemu.org
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
-SLOT=0/7
-SRC_URI=mirror://sourceforge/cdemu/cdemu-daemon-3.2.1.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2f5022f607387278b479dd963d8f4268
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.0 b/metadata/md5-cache/app-cdr/gcdemu-3.2.0
deleted file mode 100644
index 5c9877278cb8..000000000000
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
-EAPI=6
-HOMEPAGE=http://cdemu.org/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-cdr/cdemu-daemon:0/7 dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cdemu/gcdemu-3.2.0.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=394bd321e31b86cf493a6b7f23f6e369
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 9151a9b7a7d0..a2cb244f8c28 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/signing-party-2.9 b/metadata/md5-cache/app-crypt/signing-party-2.9
new file mode 100644
index 000000000000..4dd1b8c85281
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/signing-party-2.9
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 install prepare
+DEPEND=dev-lang/perl app-crypt/libmd
+DESCRIPTION=A collection of several tools related to OpenPGP
+EAPI=7
+HOMEPAGE=http://pgp-tools.alioth.debian.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.9.orig.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=c1f0ce4a9c906f421a811f42d63a8fd0
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 253ce00a9ce0..91540a399034 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/gnucash-docs-3.5 b/metadata/md5-cache/app-doc/gnucash-docs-3.5
new file mode 100644
index 000000000000..7199fb01c2b5
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Documentation package for GnuCash
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.5.tar.gz -> gnucash-docs-3.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=51d5d0a82e501e518950c86084f7b770
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 6e89e54545e8..2565bf6bbe14 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/gvim-8.1.0648-r1 b/metadata/md5-cache/app-editors/gvim-8.1.0648-r1
index 4d13b5e4a816..23109b8d9b61 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.0648-r1
+++ b/metadata/md5-cache/app-editors/gvim-8.1.0648-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=~app-editors/vim-core-8.1.0648
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
@@ -12,4 +12,4 @@ REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 pytho
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.0648.tar.gz -> vim-8.1.0648.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2493b145769ed35b1c583d3d4da94fd0
+_md5_=311c3d3443bf4145e37dafb658d176d0
diff --git a/metadata/md5-cache/app-editors/vim-8.1.0648-r1 b/metadata/md5-cache/app-editors/vim-8.1.0648-r1
index d7032d1cf15f..a8aba0a1eb3d 100644
--- a/metadata/md5-cache/app-editors/vim-8.1.0648-r1
+++ b/metadata/md5-cache/app-editors/vim-8.1.0648-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0648 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) vim-pager? ( app-editors/vim-core[-minimal] )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0648 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.0648 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.0648.tar.gz -> vim-8.1.0648.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=675b58063e8e4ebbd14237dd8acb769b
+_md5_=229ed9cbf63a769b0c3ba181dace08c5
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 6da13d9351f4..0e7da181ddeb 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) vim-pager? ( !minimal ) sys-devel/autoconf nls? ( sys-devel/gettext ) vim-pager? ( app-editors/vim-core[-minimal] ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=vim
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) vim-pager? ( !minimal )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f810965f11b498b2f453395752623716
+_md5_=8f7daf920f838c0fd25da2385175b049
diff --git a/metadata/md5-cache/app-editors/vim-core-8.1.0648 b/metadata/md5-cache/app-editors/vim-core-8.1.0648
index 756b3ecf2e3f..36d7d828a9b5 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.1.0648
+++ b/metadata/md5-cache/app-editors/vim-core-8.1.0648
@@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.0648.tar.gz -> vim-8.1.0648.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c7c28accad162c8b62a1b2f2c9b879fa
+_md5_=a96a943441e335e89ed92d244a8397d2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3f3afabeb66e..c9b892088386 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/containerd-1.2.6 b/metadata/md5-cache/app-emulation/containerd-1.2.6
new file mode 100644
index 000000000000..20aa47442c74
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) >=dev-lang/go-1.10
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=apparmor +btrfs +cri hardened +seccomp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=>=app-emulation/runc-1.0.0_rc6 seccomp? ( sys-libs/libseccomp )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.2.6.tar.gz -> containerd-1.2.6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=210c28b09011c30997f18694b52c55d0
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
new file mode 100644
index 000000000000..a87a20922ec7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/perl app-arch/unzip
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=7
+HOMEPAGE=http://www.codeweavers.com/products/crossover/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l python_targets_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=!prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses:5/5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.0.0.bin
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=bf3d8b1840a51089822c622c704fd2e6
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
new file mode 100644
index 000000000000..707676ad5c91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/perl app-arch/unzip
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=7
+HOMEPAGE=http://www.codeweavers.com/products/crossover/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l python_targets_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=!prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses:5/5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.1.0.bin
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=bf3d8b1840a51089822c622c704fd2e6
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0
new file mode 100644
index 000000000000..370bbc42d057
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/perl app-arch/unzip
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=7
+HOMEPAGE=http://www.codeweavers.com/products/crossover/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l python_targets_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=!prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses:5/5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.5.0.bin
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=bf3d8b1840a51089822c622c704fd2e6
diff --git a/metadata/md5-cache/app-emulation/docker-18.09.5 b/metadata/md5-cache/app-emulation/docker-18.09.5
new file mode 100644
index 000000000000..f637a1449d92
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-18.09.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.2.5 ~app-emulation/runc-1.0.0_rc6_p20190216[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20190405 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.5.tar.gz -> docker-18.09.5.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=7564e7302a3050ffb77166b8baf65ddf
diff --git a/metadata/md5-cache/app-emulation/docker-9999 b/metadata/md5-cache/app-emulation/docker-9999
deleted file mode 100644
index 7befa048ea1d..000000000000
--- a/metadata/md5-cache/app-emulation/docker-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-vcs/git-1.8.2.1[curl] >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The core functions you need to create Docker images and run Docker containers
-EAPI=6
-HOMEPAGE=https://dockerproject.org
-IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp kernel_linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=app-emulation/containerd-1.0.0 app-emulation/runc[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.13.0[static] )
-RESTRICT=installsources strip
-SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=facc44632d7c791e3fc9944228968cbb
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20190405 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20190405
new file mode 100644
index 000000000000..f0e64a7319fa
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20190405
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Docker container networking
+EAPI=6
+HOMEPAGE=https://github.com/docker/libnetwork
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/docker/libnetwork/archive/c9029898e32f7c89bbb81511fbb721df252ce61a.tar.gz -> docker-proxy-0.8.0_p20190405.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=8cb1f933fbaf21c0ae445913fdcee3b0
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 63671b315963..ffa2ab5b9908 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/bijiben-3.26.1 b/metadata/md5-cache/app-misc/bijiben-3.26.1
deleted file mode 100644
index 0f5e7a2e190c..000000000000
--- a/metadata/md5-cache/app-misc/bijiben-3.26.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2:2 app-misc/tracker:0/100 sys-apps/util-linux dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.50.1 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Note editor designed to remain simple to use
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Bijiben
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2:2 app-misc/tracker:0/100 sys-apps/util-linux
-SLOT=0
-SRC_URI=mirror://gnome/sources/bijiben/3.26/bijiben-3.26.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b95a099a8096f5cb6083608cbb71e04e
diff --git a/metadata/md5-cache/app-misc/tracker-1.12.4-r1 b/metadata/md5-cache/app-misc/tracker-1.12.4-r1
deleted file mode 100644
index d5b12b9b3f76..000000000000
--- a/metadata/md5-cache/app-misc/tracker-1.12.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IUSE=cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps kernel_linux test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.20:= >=dev-libs/glib-2.44:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= >=dev-libs/json-glib-1.0 >=media-libs/libpng-1.2:0= >=net-libs/libsoup-2.40:2.4 >=x11-libs/pango-1:= sys-apps/util-linux virtual/imagemagick-tools[png,jpeg?] cue? ( media-libs/libcue ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8:= ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) seccomp? ( >=sys-libs/libseccomp-2.0 )
-REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8a60362c0918c5167364a0ebaec57cd6
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 632bfb479cdf..b2756df1d887 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/gnucash-3.5 b/metadata/md5-cache/app-office/gnucash-3.5
new file mode 100644
index 000000000000..c21de89ee570
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-3.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) ~dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.19.6 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A personal finance manager
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=doc? ( ~app-doc/gnucash-docs-3.5 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.5/gnucash-3.5.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f2feec9d493215cef78e8619f1ce7127
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.3.1 b/metadata/md5-cache/app-office/libreoffice-6.2.3.2
similarity index 95%
rename from metadata/md5-cache/app-office/libreoffice-6.2.3.1
rename to metadata/md5-cache/app-office/libreoffice-6.2.3.2
index 5c17afbd15b6..bb296254fcd6 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.3.1
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.3.2
@@ -10,6 +10,6 @@ PDEPEND==app-office/libreoffice-l10n-6.2*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.3.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.3.1.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.3//libreoffice-6.2.3.1.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.3//libreoffice-help-6.2.3.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.3.1/src/libreoffice-6.2.3.1.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.3.1/src/libreoffice-help-6.2.3.1.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.3//libreoffice-6.2.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.3//libreoffice-help-6.2.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.3.2/src/libreoffice-6.2.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.3.2/src/libreoffice-help-6.2.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3f1bb7ceb00f8f8cb50d0cd91599d594
+_md5_=a9b61f15963aeb044208a321c63b948e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 32d6267a9bcc..f7193c25cc85 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.33.5 b/metadata/md5-cache/app-portage/eix-0.33.5
deleted file mode 100644
index bbd9d467525c..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.33.5
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Search and query ebuilds
-EAPI=6
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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.33.5/eix-0.33.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	a6dd0427ea9c68067a0a7fe2236b457f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9a25f0438ec43d68e4d29d70db31fd0
diff --git a/metadata/md5-cache/app-portage/eix-0.33.7 b/metadata/md5-cache/app-portage/eix-0.33.7
index a5c36b828374..37205de2a5d7 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.7
+++ b/metadata/md5-cache/app-portage/eix-0.33.7
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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.33.7/eix-0.33.7.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	a6dd0427ea9c68067a0a7fe2236b457f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79f09eb2ea8733f9acb7a417ac74ba2e
+_md5_=33f25fbb01c6fe30b12a08b5377be1ed
diff --git a/metadata/md5-cache/app-portage/pram-2-r1 b/metadata/md5-cache/app-portage/pram-2-r1
deleted file mode 100644
index 81480be5ee54..000000000000
--- a/metadata/md5-cache/app-portage/pram-2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tool to ease merging Pull Requests and git patches
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/pram
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-vcs/git net-misc/wget[ssl] virtual/editor !dev-perl/Gentoo-App-Pram
-SLOT=0
-SRC_URI=https://github.com/mgorny/pram/archive/v2.tar.gz -> pram-2.tar.gz
-_md5_=d1e5eb8d1d76804dc28d403cdff4733e
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index e1cb5271c91c..e43346527dd8 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/autojump-22.5.3 b/metadata/md5-cache/app-shells/autojump-22.5.3
index d43ed29875eb..7c63059c64f4 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.3
+++ b/metadata/md5-cache/app-shells/autojump-22.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=ipython? ( || ( python_targets_python2_7 python_targets_python3_5 p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz -> autojump-22.5.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=29e39b4192354631b6b4b07a423dd80c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=28b713dce2184a9644b9e777aac91e2e
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 444639feffdf..8b876412c5cf 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/libgepub-0.4 b/metadata/md5-cache/app-text/libgepub-0.4
deleted file mode 100644
index f9b0c5becb2a..000000000000
--- a/metadata/md5-cache/app-text/libgepub-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject based library for handling and rendering epub documents
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/libgepub
-IUSE=+introspection
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgepub/0.4/libgepub-0.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=482e335ca5a4b8c661e4481dab3de84d
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index d0eb02e8eb17..3cd31ee1eef1 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/libjson-rpc-cpp-1.1.1-r1 b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.1-r1
deleted file mode 100644
index 7283c9fedc1c..000000000000
--- a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-libs/libmicrohttpd:= ) redis-client? ( dev-libs/hiredis:= ) redis-server? ( dev-libs/hiredis:= ) stubgen? ( dev-libs/argtable:= ) doc? ( app-doc/doxygen ) test? ( dev-cpp/catch:0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=JSON-RPC (1.0 & 2.0) framework for C++
-EAPI=6
-HOMEPAGE=https://github.com/cinemast/libjson-rpc-cpp
-IUSE=doc +http-client +http-server redis-client redis-server +stubgen test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-libs/libmicrohttpd:= ) redis-client? ( dev-libs/hiredis:= ) redis-server? ( dev-libs/hiredis:= ) stubgen? ( dev-libs/argtable:= )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/cinemast/libjson-rpc-cpp/archive/v1.1.1.tar.gz -> libjson-rpc-cpp-1.1.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2d85c60cbec59f36b8cc0e0a0dd01e68
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
new file mode 100644
index 000000000000..b06001c66204
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=JSON for Modern C++
+EAPI=7
+HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/nlohmann/json/archive/v3.6.1.tar.gz -> nlohmann_json-3.6.1.tar.gz
+_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=0ce3f42f9991f3c61b8c566b517d3184
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 1c2c5d7c1089..3adad437a341 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/lmdb-0.9.23 b/metadata/md5-cache/dev-db/lmdb-0.9.23
index afef32e86330..42408e1f9d4e 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.23
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.23
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=7
 HOMEPAGE=https://symas.com/lmdb/technical/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=OPENLDAP
 SLOT=0/0.9.23
 SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.23.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=c52ee5927024f517e23ae74e47082100
+_md5_=d70518db54e663685493a802d13b4a3a
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.5 b/metadata/md5-cache/dev-db/pgadmin4-4.5
new file mode 100644
index 000000000000..d73f739011c0
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=6
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=POSTGRESQL
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=app-text/htmlmin-0.1.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/Babel-2.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/beautifulsoup-4.4.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/blinker-1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/click-6.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/cryptography-2.2.2-r1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/extras-1.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/fixtures-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-0.12.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-babel-0.11.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-babelex-0.9.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-htmlmin-1.3.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-login-0.3.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-migrate-2.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-security-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/flask-wtf-0.14.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/html5lib-1.0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/itsdangerous-0.24[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/jinja-2.7.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/linecache2-1.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/markupsafe-0.23[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/mimeparse-1.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/passlib-1.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pbr-3.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/psutil-5.4.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/psycopg-2.7.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyrsistent-0.14.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-dateutil-2.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pytz-2018.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/simplejson-3.13.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/six-1.11.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/speaklater-1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.2.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/sshtunnel-0.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/werkzeug-0.9.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/wtforms-2.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v4.5/source/pgadmin4-4.5.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=69051e1d78850351bc24eb602259707d
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 05ad35e35767..54b7a2887378 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/platformio-3.6.4 b/metadata/md5-cache/dev-embedded/platformio-3.6.6
similarity index 98%
rename from metadata/md5-cache/dev-embedded/platformio-3.6.4
rename to metadata/md5-cache/dev-embedded/platformio-3.6.6
index 478135e8051b..21908cc2b1be 100644
--- a/metadata/md5-cache/dev-embedded/platformio-3.6.4
+++ b/metadata/md5-cache/dev-embedded/platformio-3.6.6
@@ -10,6 +10,6 @@ LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/arrow-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/bottle-0.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/click-5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/click-6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/colorama[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/lockfile-0.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lockfile-0.9.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pyserial-3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/pyserial-4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/requests-2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/requests-3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/semantic_version-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=mirror://pypi/p/platformio/platformio-3.6.4.tar.gz
+SRC_URI=mirror://pypi/p/platformio/platformio-3.6.6.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
 _md5_=e787608f870809124769edb364efab86
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d012c6721f74..9cd7db7ff97a 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/go-1.11.8 b/metadata/md5-cache/dev-lang/go-1.11.8
new file mode 100644
index 000000000000..aa4cd967596f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.11.8
@@ -0,0 +1,14 @@
+BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DEFINED_PHASES=compile install pretend test unpack
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=gccgo
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.11.8
+SRC_URI=https://storage.googleapis.com/golang/go1.11.8.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=367a86185a57574abf7278220016db13
diff --git a/metadata/md5-cache/dev-lang/go-1.12.3 b/metadata/md5-cache/dev-lang/go-1.12.3
new file mode 100644
index 000000000000..52802075482f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.12.3
@@ -0,0 +1,14 @@
+BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DEFINED_PHASES=compile install pretend test unpack
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=gccgo
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.12.3
+SRC_URI=https://storage.googleapis.com/golang/go1.12.3.src.tar.gz !gccgo? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz )
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=367a86185a57574abf7278220016db13
diff --git a/metadata/md5-cache/dev-lang/tcc-0.9.26-r2 b/metadata/md5-cache/dev-lang/tcc-0.9.26-r2
deleted file mode 100644
index 12dfaea3fbfc..000000000000
--- a/metadata/md5-cache/dev-lang/tcc-0.9.26-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A very small C compiler for ix86/amd64
-EAPI=5
-HOMEPAGE=https://bellard.org/tcc/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=LGPL-2.1
-RDEPEND=!dev-lang/tendra
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.26.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=12fde3d9ce03b803b7804822da5e625d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c827d11aef09..9ac89682c22a 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/elfutils-0.173-r1 b/metadata/md5-cache/dev-libs/elfutils-0.173-r1
index 10c955a99c07..ef1986aaba77 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.173-r1
+++ b/metadata/md5-cache/dev-libs/elfutils-0.173-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=6
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.173/elfutils-0.173.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6918b9efcb0bd69e57df339aef72530a
+_md5_=bb97b287b817123187ad20190144ca45
diff --git a/metadata/md5-cache/dev-libs/folks-0.11.4 b/metadata/md5-cache/dev-libs/folks-0.11.4
deleted file mode 100644
index 7596945ed14b..000000000000
--- a/metadata/md5-cache/dev-libs/folks-0.11.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=|| ( dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/glib-2.40:2 dev-libs/dbus-glib >=dev-libs/gobject-introspection-1.30:= >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:0= sys-libs/readline:0= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] ) telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] ) tracker? ( >=app-misc/tracker-1:0/100 ) >=dev-util/intltool-0.50.0 sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus bluetooth? ( >=gnome-extra/evolution-data-server-3.9.1 >=dev-libs/glib-2.40:2 ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Library for aggregating people from multiple sources
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Folks
-IUSE=bluetooth debug eds +telepathy test tracker utils test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=|| ( dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/glib-2.40:2 dev-libs/dbus-glib >=dev-libs/gobject-introspection-1.30:= >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:0= sys-libs/readline:0= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] ) telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] ) tracker? ( >=app-misc/tracker-1:0/100 ) net-im/telepathy-mission-control
-REQUIRED_USE=bluetooth? ( eds )
-SLOT=0/25
-SRC_URI=mirror://gnome/sources/folks/0.11/folks-0.11.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9904f9cb26eedc82018a9159107ab115
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1
new file mode 100644
index 000000000000..81d7bfebbb35
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libcdio/
+IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+ GPL-2+ LGPL-2.1
+RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/2
+SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e5c468a7805ffe6920e4eb250a3af17e
diff --git a/metadata/md5-cache/dev-libs/libgit2-9999 b/metadata/md5-cache/dev-libs/libgit2-9999
index cea1b1d2ad2a..b51cd7d1c926 100644
--- a/metadata/md5-cache/dev-libs/libgit2-9999
+++ b/metadata/md5-cache/dev-libs/libgit2-9999
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A linkable library for Git
 EAPI=6
 HOMEPAGE=https://libgit2.github.com/
-IUSE=+curl examples gssapi libressl +ssh test +threads trace
+IUSE=examples gssapi libressl +ssh test +threads trace
 LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= curl? ( !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] ) libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] ) ) gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-SLOT=0/27
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/28
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5c4a0073c710a813be5aa9314f57bc24
+_md5_=6f853395561626645a3c24575e9a5ec8
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.27.7 b/metadata/md5-cache/dev-libs/libgit2-glib-0.27.7
deleted file mode 100644
index bb595ce22030..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.27.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 <dev-libs/libgit2-0.28:0=[ssh?] >=dev-libs/libgit2-0.26.0:0 python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-util/glib-utils virtual/pkgconfig vala? ( || ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Git library for GLib
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python +ssh +vala python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 <dev-libs/libgit2-0.28:0=[ssh?] >=dev-libs/libgit2-0.26.0:0 python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.27/libgit2-glib-0.27.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d181ea72aff4613be428c37e917e5b9b
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.0 b/metadata/md5-cache/dev-libs/libmirage-3.2.0
deleted file mode 100644
index 793c5185a971..000000000000
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.28:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CD and DVD image access library
-EAPI=6
-HOMEPAGE=http://cdemu.org
-IUSE=doc +introspection
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.28:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
-SLOT=0/11
-SRC_URI=mirror://sourceforge/cdemu/libmirage-3.2.0.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=27f373b0bfc31354617cc6df40ad06a1
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.1 b/metadata/md5-cache/dev-libs/libmirage-3.2.1
deleted file mode 100644
index f3b6d34ccc3c..000000000000
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CD and DVD image access library
-EAPI=6
-HOMEPAGE=http://cdemu.org
-IUSE=doc +introspection
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
-SLOT=0/11
-SRC_URI=mirror://sourceforge/cdemu/libmirage-3.2.1.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fc568d56f6bccccf14d1dfe431710d27
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r1 b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
index 2b927f4b509a..8f71dbd212d4 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.32-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
@@ -4,10 +4,10 @@ DESCRIPTION=reimplement libdjb - excellent libraries from Dan Bernstein
 EAPI=7
 HOMEPAGE=https://www.fefe.de/libowfat/
 IUSE=diet
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=21ed32e651df25025a67a5f111ed59c8
+_md5_=3333559804dd7ac452195f19088267f8
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.40.14 b/metadata/md5-cache/dev-libs/vala-common-0.40.14
index 3a1c600258e0..9fcce91ecc0e 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.40.14
+++ b/metadata/md5-cache/dev-libs/vala-common-0.40.14
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.14.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0913c697f033d201b8d81789203381f5
+_md5_=aceee17097fcc3adbad66058f54d196e
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.11 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.11
index 55d5e27723c5..03ac2fb80af8 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.11
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=dev-libs/xapian-1.4.9:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) )
+DEPEND=>=dev-libs/xapian-1.4.9:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) )
 DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
-IUSE=java lua mono perl php python ruby tcl elibc_FreeBSD java php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=java lua mono perl php python ruby tcl elibc_FreeBSD java php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/xapian-1.4.9:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) )
-REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby23 ruby_targets_ruby24 ) ) php? ( || ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) )
+RDEPEND=>=dev-libs/xapian-1.4.9:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) )
+REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) ) php? ( || ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.11/xapian-bindings-1.4.11.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6963758f3d1cc4089b87d29c7c0275e6
+_md5_=f1ab340047f9fc1e1523f89699f028f6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 77840d3d4bdc..82c72c0db66d 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/attrs-19.1.0 b/metadata/md5-cache/dev-python/attrs-19.1.0
new file mode 100644
index 000000000000..4728f6677c4b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/attrs-19.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-python/hypothesis-3.6.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Attributes without boilerplate
+EAPI=7
+HOMEPAGE=https://github.com/hynek/attrs https://attrs.readthedocs.org/ https://pypi.org/project/attrs/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-python/zope-interface[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/a/attrs/attrs-19.1.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=d6587cf604de61d99900b810675e3cf2
diff --git a/metadata/md5-cache/dev-python/collective-checkdocs-0.2 b/metadata/md5-cache/dev-python/collective-checkdocs-0.2
index cc5d831e01ea..fc92da4412df 100644
--- a/metadata/md5-cache/dev-python/collective-checkdocs-0.2
+++ b/metadata/md5-cache/dev-python/collective-checkdocs-0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Distutils command to view/validate packages's rst text long_descriptions.
 EAPI=6
 HOMEPAGE=https://github.com/collective/collective.checkdocs
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=68f9ef112dc470744ef0d4617f23abb9
+_md5_=565467a4602a0d02c045915b731ea3a4
diff --git a/metadata/md5-cache/dev-python/decorator-4.3.2 b/metadata/md5-cache/dev-python/decorator-4.3.2
new file mode 100644
index 000000000000..0cdb9a09728a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/decorator-4.3.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Simplifies the usage of decorators for the average programmer
+EAPI=7
+HOMEPAGE=https://github.com/micheles/decorator https://pypi.org/project/decorator/
+IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/decorator/decorator-4.3.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=ebf35eab821859c2530843d586463136
diff --git a/metadata/md5-cache/dev-python/django-rq-1.3.1 b/metadata/md5-cache/dev-python/django-rq-1.3.1
new file mode 100644
index 000000000000..d26b1b317275
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-rq-1.3.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/django-1.8.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/rq-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=An app that provides django integration for RQ (Redis Queue)
+EAPI=7
+HOMEPAGE=https://github.com/rq/django-rq
+IUSE=python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/django-1.8.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/rq-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/django-rq/django-rq-1.3.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=bfa52c85c182be84d6041c6c4021fd68
diff --git a/metadata/md5-cache/dev-python/docker-py-3.7.0 b/metadata/md5-cache/dev-python/docker-py-3.7.0
new file mode 100644
index 000000000000..b53a03c18198
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docker-py-3.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/docker-pycreds-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( dev-python/recommonmark[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python client for Docker
+EAPI=6
+HOMEPAGE=https://github.com/docker/docker-py
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/docker-pycreds-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/docker/docker-py/archive/3.7.0.tar.gz -> docker-py-3.7.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6d0d70303c08d9be592a222da18f92cb
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.6.5 b/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
index ee45a102f916..35b7fdcae7da 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/google-auth-httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/google-auth-httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Google API Client for Python
 EAPI=5
 HOMEPAGE=https://github.com/google/google-api-python-client
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/httplib2-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/oauth2client-5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/uritemplate-3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/uritemplate-4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.6.5.tar.gz -> google-api-python-client-1.6.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=56d2f7d28d434838633e5b40734a5dde
+_md5_=0cb33c59c9ae66cace266fbb80dab2c8
diff --git a/metadata/md5-cache/dev-python/google-auth-1.0.1 b/metadata/md5-cache/dev-python/google-auth-1.0.1
index 690a39692571..8c4204b7d6ff 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.0.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Google Authentication Library
 EAPI=6
 HOMEPAGE=https://pypi.org/project/google-auth/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.0.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=860340306f47bd99ca4eae37206ad5fa
+_md5_=ff18f09f68094765d380db5c1ab5e6ef
diff --git a/metadata/md5-cache/dev-python/google-auth-1.4.1 b/metadata/md5-cache/dev-python/google-auth-1.4.1
index 17de93cfb66e..39a8c378081c 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.4.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Google Authentication Library
 EAPI=6
 HOMEPAGE=https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/namespace-google[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.4.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a9ea2557a975964eb1790472fc387525
+_md5_=d87cad097f334cfe1484163bc9e1b810
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
index 96a2a6106e75..0952478e1ed1 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-localserver[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=httplib2 Transport for Google Auth
 EAPI=6
 HOMEPAGE=https://pypi.org/project/google-auth-httplib2/ https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/httplib2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-auth[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/607e86011141e8885b1f52826d57c8b5ff588ffc.tar.gz -> google-auth-httplib2-0.0.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8a611e2e2bdd347b2b115df96322a75d
+_md5_=3eecb8b60360652f050e31b47794b053
diff --git a/metadata/md5-cache/dev-python/httplib2-0.12.1 b/metadata/md5-cache/dev-python/httplib2-0.12.1
index 1556933d9662..8169f5dd0bd4 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.12.1
+++ b/metadata/md5-cache/dev-python/httplib2-0.12.1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.12.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=1706151ed749895473362f8e3f08e482
+_md5_=448411b735e96dda57bdcf9ef4a5d762
diff --git a/metadata/md5-cache/dev-python/hypothesis-4.15.0 b/metadata/md5-cache/dev-python/hypothesis-4.15.0
new file mode 100644
index 000000000000..51d91d1d6eb7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-4.15.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+),sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/attrs-16.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flaky[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-16.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+),sqlite] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-4.15.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=29c867369510dc51327dc3504cde6868
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1 b/metadata/md5-cache/dev-python/keyring-13.2.1
index 1d682502966c..90ba31b38cab 100644
--- a/metadata/md5-cache/dev-python/keyring-13.2.1
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/entrypoints[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-flake8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/collective-checkdocs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/secretstorage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-flake8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/collective-checkdocs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Provides access to the system keyring service
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-13.2.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=450f98cb4f1ea896dec6a5eb75f10843
+_md5_=0863490bbbaef76adab5b9abedab82a0
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180503 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180503
deleted file mode 100644
index 14742a1ea94f..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180503
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/miniupnpc-2.0.20180503:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for UPnP client library
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.0.20180503:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180503.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=af90a99cfc6ab20b4c2c02af409db498
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190403 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190403
deleted file mode 100644
index 22695600e4bc..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190403
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/miniupnpc-2.1.20190403:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for UPnP client library
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.1.20190403:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190403.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3f23dd01f09d2088a26e321c9a50597a
diff --git a/metadata/md5-cache/dev-python/more-itertools-7.0.0 b/metadata/md5-cache/dev-python/more-itertools-7.0.0
new file mode 100644
index 000000000000..80863bae127a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/more-itertools-7.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=More routines for operating on iterables, beyond itertools
+EAPI=7
+HOMEPAGE=https://pypi.org/project/more-itertools/
+IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/m/more-itertools/more-itertools-7.0.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=01350240d4769a3096aaf733fd0769b4
diff --git a/metadata/md5-cache/dev-python/munch-2.3.2 b/metadata/md5-cache/dev-python/munch-2.3.2
new file mode 100644
index 000000000000..823087401a8b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/munch-2.3.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
+EAPI=7
+HOMEPAGE=https://github.com/Infinidat/munch
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/m/munch/munch-2.3.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=d29c8d834601079cab648f19687607f9
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3 b/metadata/md5-cache/dev-python/oauth2client-4.1.3
new file mode 100644
index 000000000000..5e8553551448
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Library for accessing resources protected by OAuth 2.0
+EAPI=6
+HOMEPAGE=https://github.com/google/oauth2client
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.1.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.0.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) !<=dev-python/google-api-python-client-1.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/google/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=8c5a4cca31b89c21f435143a3f22c004
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.27.0 b/metadata/md5-cache/dev-python/openstacksdk-0.27.0
new file mode 100644
index 000000000000..f74db7f954f0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.27.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=A collection of libraries for building applications to work with OpenStack.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-openstacksdk
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/appdirs-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requestsexceptions-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonpatch-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/jsonpatch-1.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/munch-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jmespath-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.27.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=e8754a8658109ee5b8f6aefdf6c22123
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.32.0 b/metadata/md5-cache/dev-python/os-client-config-1.32.0
new file mode 100644
index 000000000000..e4032674195f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/os-client-config-1.32.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=OpenStack Client Configuation Library
+EAPI=7
+HOMEPAGE=http://www.openstack.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.32.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=77817752dc6d1cfb8df1fb6e2ffe2e8c
diff --git a/metadata/md5-cache/dev-python/osc-lib-1.12.1 b/metadata/md5-cache/dev-python/osc-lib-1.12.1
new file mode 100644
index 000000000000..cec8298d07c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osc-lib-1.12.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=A package of common support modules for writing OSC plugins.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/osc-lib
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-client-config-1.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/osc-lib/osc-lib-1.12.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=7ea6e4571d12fa4356799297eec1a813
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.29.2 b/metadata/md5-cache/dev-python/oslo-reports-1.29.2
new file mode 100644
index 000000000000..590d7f2caf3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-reports-1.29.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=generified reports for openstack
+EAPI=7
+HOMEPAGE=http://docs.openstack.org/developer/oslo.reports
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/jinja-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.29.2.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=9bf0f77a8f210bd97bb43cbcb271183d
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1
new file mode 100644
index 000000000000..7c2297628806
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=A library that provides a generic versioned and RPC-friendly object model.
+EAPI=7
+HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.35.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=41adb324c9fd2e7232dca13cf420a2c6
diff --git a/metadata/md5-cache/dev-python/psutil-5.6.0 b/metadata/md5-cache/dev-python/psutil-5.6.0
new file mode 100644
index 000000000000..dd23571c4ccb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-5.6.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=7
+HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/psutil/psutil-5.6.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=e6e3fec3a90e092760691cddf2a135f4
diff --git a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1 b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
index 3a1afd8769fb..51d6db610204 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=py.test plugin for flake8
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flake8/pytest-flake8-0.9.1.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7c8831b47fd6e5cf79a5ee8dde6e78fe
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=faab07aaa7b0265f43db5f3fd1d8dfe0
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1 b/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
new file mode 100644
index 000000000000..3973b21504e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=Client library for Barbican API.
+EAPI=7
+HOMEPAGE=https://github.com/openstack/barbican
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-4.8.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=d941048c8f73fd33720d069d79cde551
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.12.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
new file mode 100644
index 000000000000..9913e3a46939
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mox3-0.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-openstackclient-3.12.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/subunit-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/openstackdocstheme-1.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A client for the OpenStack Quantum API
+EAPI=7
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osc-lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-client-config-1.28.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=test? ( doc ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.12.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=df1e22876327339b09507207d8740caf
diff --git a/metadata/md5-cache/dev-python/python-novaclient-13.0.0 b/metadata/md5-cache/dev-python/python-novaclient-13.0.0
new file mode 100644
index 000000000000..7404d9ef8e2c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-novaclient-13.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ddt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keyring-5.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.11.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A client for the OpenStack Nova API
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-novaclient
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/keystoneauth-3.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-13.0.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=ecaaef0f180e30942c9615d23efb26f4
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-3.18.0 b/metadata/md5-cache/dev-python/python-openstackclient-3.18.0
new file mode 100644
index 000000000000..4019cf85139e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-openstackclient-3.18.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DESCRIPTION=A client for the OpenStack APIs
+EAPI=7
+HOMEPAGE=https://github.com/openstack/python-openstackclient
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osc-lib-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-10.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-3.18.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=02440874d8fc2d410429632169dc8eeb
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index a94e575f71f2..7e35fe30e23c 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python binding to libudev
 EAPI=6
 HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
-IUSE=pygobject qt5 test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=pygobject qt5 test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 ~mips x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=86682d43969795977838eb436e3264b6
+_md5_=fad55f533d3909ee59bf171213a45975
diff --git a/metadata/md5-cache/dev-python/rq-0.13.0 b/metadata/md5-cache/dev-python/rq-0.13.0
new file mode 100644
index 000000000000..c0dd7568ef2a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rq-0.13.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=simple, lightweight library for creating and processing background jobs
+EAPI=7
+HOMEPAGE=https://github.com/rq/rq
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/r/rq/rq-0.13.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=0640a4075937af6c497acee40ce34c15
diff --git a/metadata/md5-cache/dev-python/rsa-3.2.3-r1 b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
index cb4ba72018e8..e6a511af0007 100644
--- a/metadata/md5-cache/dev-python/rsa-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-0.6.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-0.6.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Pure-Python RSA implementation
 EAPI=5
 HOMEPAGE=https://stuvel.eu/rsa https://pypi.org/project/rsa/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=73eb7635a8e83a983bb8f613bd48c7d7
+_md5_=8e0d7cf31b365eab54c3e40adfa09072
diff --git a/metadata/md5-cache/dev-python/rsa-3.4.2 b/metadata/md5-cache/dev-python/rsa-3.4.2
index 46ee01b1e050..df8a422013dc 100644
--- a/metadata/md5-cache/dev-python/rsa-3.4.2
+++ b/metadata/md5-cache/dev-python/rsa-3.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-0.6.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-0.6.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Pure-Python RSA implementation
 EAPI=5
 HOMEPAGE=https://stuvel.eu/rsa https://pypi.org/project/rsa/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cce6ded0dab6768b66a233c1470096e5
+_md5_=f43a5b7ce2b1885aca5a4cfa41f28da5
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.69 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.69
index 2c00d10a015a..fc45a1f56b02 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.69
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.69
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python object API for managing the Linux LIO kernel target
 EAPI=7
 HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/pyudev[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.69.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=881873e961dbb26247d8d23cb9ff28df
+_md5_=87c423945fff1b27289cc3be034dac19
diff --git a/metadata/md5-cache/dev-python/secretstorage-2.3.1 b/metadata/md5-cache/dev-python/secretstorage-2.3.1
index 76aa693a9afe..301fe734cba4 100644
--- a/metadata/md5-cache/dev-python/secretstorage-2.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-2.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=6
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-2.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f22bc7df97885409942a7d3199447ddc
+_md5_=10c2657307d369cba0ec57b79ce0d70f
diff --git a/metadata/md5-cache/dev-python/tooz-1.60.1 b/metadata/md5-cache/dev-python/tooz-1.60.1
index 980372bfe418..cfd5d27724c4 100644
--- a/metadata/md5-cache/dev-python/tooz-1.60.1
+++ b/metadata/md5-cache/dev-python/tooz-1.60.1
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Library centralizing the most common distributed primitives
-EAPI=6
+EAPI=7
 HOMEPAGE=http://docs.openstack.org/developer/tooz/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/voluptuous-0.8.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.8.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fasteners-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tooz/tooz-1.60.1.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ce3fc4e3f38154f2ee1a4aa71e06a086
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=85588a30829fdd1a521a292a66d51178
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.0 b/metadata/md5-cache/dev-python/uritemplate-3.0.0
index 0adbee352d00..cee703f6e855 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.0
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<=dev-python/google-api-python-client-1.3 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<=dev-python/google-api-python-client-1.3 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python implementation of RFC6570, URI Template
 EAPI=6
 HOMEPAGE=https://pypi.org/project/uritemplate/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<=dev-python/google-api-python-client-1.3 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<=dev-python/google-api-python-client-1.3 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fd026e8448dd45ba086a123fe35ba6a9
+_md5_=fd0a90df3b63f1c0f450d781a9ba4603
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
index d4c0a40fa0ac..e7cc2c34d9af 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/dbf[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/dbf[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/dbf[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/dbf[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/dbf[ruby_targets_ruby26] dev-ruby/nokogiri[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby data holder for OGC Simple Features
 EAPI=5
 HOMEPAGE=https://github.com/nofxx/georuby
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.5.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f650768200d9090c098cd06e21dc315d
+_md5_=95e6090e53db64d7582624aa1c091a4e
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 05913f5a816d..07775a6f2d19 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/activeldap-5.2.2 b/metadata/md5-cache/dev-ruby/activeldap-5.2.2
deleted file mode 100644
index 3c6669c67e3d..000000000000
--- a/metadata/md5-cache/dev-ruby/activeldap-5.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby23] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/locale[ruby_targets_ruby24] dev-ruby/ruby-gettext[ruby_targets_ruby24] dev-ruby/gettext_i18n_rails[ruby_targets_ruby24] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby24] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby25] dev-ruby/builder[ruby_targets_ruby25] dev-ruby/locale[ruby_targets_ruby25] dev-ruby/ruby-gettext[ruby_targets_ruby25] dev-ruby/gettext_i18n_rails[ruby_targets_ruby25] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby25] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby25] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=ActiveLDAP provides an activerecord inspired object oriented interface to LDAP
-EAPI=6
-HOMEPAGE=https://github.com/activeldap/activeldap
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] dev-ruby/ruby-gettext[ruby_targets_ruby23] dev-ruby/gettext_i18n_rails[ruby_targets_ruby23] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby23] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/locale[ruby_targets_ruby24] dev-ruby/ruby-gettext[ruby_targets_ruby24] dev-ruby/gettext_i18n_rails[ruby_targets_ruby24] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby24] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >dev-ruby/activemodel-4.0.0:*[ruby_targets_ruby25] dev-ruby/builder[ruby_targets_ruby25] dev-ruby/locale[ruby_targets_ruby25] dev-ruby/ruby-gettext[ruby_targets_ruby25] dev-ruby/gettext_i18n_rails[ruby_targets_ruby25] || ( dev-ruby/ruby-net-ldap[ruby_targets_ruby25] >=dev-ruby/ruby-ldap-0.8.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://rubygems/activeldap-5.2.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b358f0238278f7af4812c5a40d75510b
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
deleted file mode 100644
index 6ce88c6c3cd1..000000000000
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Provides POSIX tarchive management from Ruby programs
-EAPI=6
-HOMEPAGE=https://github.com/halostatue/minitar
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD-2 Ruby )
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/halostatue/minitar/archive/v0.6.1.tar.gz -> archive-tar-minitar-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=674805ad910e0babb5a3801b79dce4e8
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.7 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.7
deleted file mode 100644
index ec65360cd4de..000000000000
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Provides POSIX tarchive management from Ruby programs
-EAPI=6
-HOMEPAGE=https://github.com/halostatue/minitar
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD-2 Ruby )
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/halostatue/minitar/archive/v0.7.tar.gz -> archive-tar-minitar-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=26065101fffa3913bcf0582e70119b71
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.10.100 b/metadata/md5-cache/dev-ruby/aws-sdk-2.10.100
deleted file mode 100644
index eb47570c9a7b..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.10.100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.10.100[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ~dev-ruby/aws-sdk-resources-2.10.100[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official SDK for Amazon Web Services
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.10.100[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ~dev-ruby/aws-sdk-resources-2.10.100[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.10.100.tar.gz -> aws-sdk-ruby-2.10.100.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ace03acea89e8fbde5a937c15d617a8f
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.10.134 b/metadata/md5-cache/dev-ruby/aws-sdk-2.10.134
deleted file mode 100644
index 5456251a33c5..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.10.134
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.10.134[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ~dev-ruby/aws-sdk-resources-2.10.134[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official SDK for Amazon Web Services
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ~dev-ruby/aws-sdk-resources-2.10.134[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ~dev-ruby/aws-sdk-resources-2.10.134[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.10.134.tar.gz -> aws-sdk-ruby-2.10.134.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=93fded569643f0b77746cb3b6e1dc3c2
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.100 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.100
deleted file mode 100644
index 6e87a31e5e0d..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/aws-sigv4[ruby_targets_ruby24] dev-ruby/jmespath:1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official SDK for Amazon Web Services
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/aws-sigv4[ruby_targets_ruby24] dev-ruby/jmespath:1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.10.100.tar.gz -> aws-sdk-ruby-2.10.100.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a50697c92d5c4f472d385da9b5cb146a
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.134 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.134
deleted file mode 100644
index 33c85a84721b..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.134
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/aws-sigv4[ruby_targets_ruby24] dev-ruby/jmespath:1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official SDK for Amazon Web Services
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/aws-sigv4[ruby_targets_ruby23] dev-ruby/jmespath:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/aws-sigv4[ruby_targets_ruby24] dev-ruby/jmespath:1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.10.134.tar.gz -> aws-sdk-ruby-2.10.134.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8d3d18e4ba47d6bade3342038de29489
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.100 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.100
deleted file mode 100644
index 7d17cca1bbf2..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.10.100[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/aws-sdk-core-2.10.100[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/webmock[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official SDK for Amazon Web Services
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.10.100[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/aws-sdk-core-2.10.100[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.10.100.tar.gz -> aws-sdk-ruby-2.10.100.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f4ed7bdb519b456872976fb6e7490719
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.134 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.134
deleted file mode 100644
index 459496433f46..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.134
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.10.134[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/aws-sdk-core-2.10.134[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/webmock[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Official SDK for Amazon Web Services
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdkforruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/aws-sdk-core-2.10.134[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/aws-sdk-core-2.10.134[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.10.134.tar.gz -> aws-sdk-ruby-2.10.134.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bdf5bc2898a62dfce7889914258efe4f
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.2 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.2
deleted file mode 100644
index c1ca889b8ae4..000000000000
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Amazon Web Services Signature Version 4 signing library
-EAPI=6
-HOMEPAGE=https://aws.amazon.com/sdk-for-ruby/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1
-SRC_URI=mirror://rubygems/aws-sigv4-1.0.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=af8bc38b64ea527497ce537d1bacdd17
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.5 b/metadata/md5-cache/dev-ruby/barby-0.6.5
deleted file mode 100644
index 6a06a475ac99..000000000000
--- a/metadata/md5-cache/dev-ruby/barby-0.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby23] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ) test? ( ruby_targets_ruby23? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby23] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby23] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby barcode generator that doesn't rely on 3rd party libraries
-EAPI=5
-HOMEPAGE=http://toreto.re/barby/
-IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby23] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby23] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby23] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=prawn? ( test )
-SLOT=0
-SRC_URI=https://github.com/toretore/barby/archive/v0.6.5.tar.gz -> barby-0.6.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d1687614420f3aa7939b4d1d70af5d79
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.0 b/metadata/md5-cache/dev-ruby/bindata-2.4.0
deleted file mode 100644
index f8af8cce1e9d..000000000000
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Parsing Binary Data in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/dmendel/bindata
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2.4.0
-SRC_URI=mirror://rubygems/bindata-2.4.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=22e3e442314d429feb77d0c7d21f9bc7
diff --git a/metadata/md5-cache/dev-ruby/bson-4.2.2 b/metadata/md5-cache/dev-ruby/bson-4.2.2
deleted file mode 100644
index 92535ee6cf0e..000000000000
--- a/metadata/md5-cache/dev-ruby/bson-4.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
-EAPI=6
-HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=APSL-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=4
-SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.2.2.tar.gz -> bson-4.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e41270a2c1b8b9d8f68328ce0a0929c4
diff --git a/metadata/md5-cache/dev-ruby/bson-4.3.0 b/metadata/md5-cache/dev-ruby/bson-4.3.0
deleted file mode 100644
index c03bb7f39e10..000000000000
--- a/metadata/md5-cache/dev-ruby/bson-4.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
-EAPI=6
-HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=APSL-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=4
-SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.3.0.tar.gz -> bson-4.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a82222f02fd7016b07dbb0c5d669b2b
diff --git a/metadata/md5-cache/dev-ruby/bson-4.4.1 b/metadata/md5-cache/dev-ruby/bson-4.4.1
deleted file mode 100644
index 99a04003693e..000000000000
--- a/metadata/md5-cache/dev-ruby/bson-4.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
-EAPI=6
-HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=APSL-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=4
-SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.4.1.tar.gz -> bson-4.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0a3c11f2120026f8353e6b02052f3c96
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.10.1 b/metadata/md5-cache/dev-ruby/capistrano-3.10.1
deleted file mode 100644
index 2895f615f0ff..000000000000
--- a/metadata/md5-cache/dev-ruby/capistrano-3.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby23] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby24] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] dev-ruby/i18n:*[ruby_targets_ruby24] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A distributed application deployment system
-EAPI=6
-HOMEPAGE=http://capistranorb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby23] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby24] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] dev-ruby/i18n:*[ruby_targets_ruby24] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/capistrano-3.10.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a1723b8a2a5a959f5b8928069b8051e
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.10.2 b/metadata/md5-cache/dev-ruby/capistrano-3.10.2
deleted file mode 100644
index a30cad0a24aa..000000000000
--- a/metadata/md5-cache/dev-ruby/capistrano-3.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby23] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby24] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] dev-ruby/i18n:*[ruby_targets_ruby24] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A distributed application deployment system
-EAPI=6
-HOMEPAGE=http://capistranorb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby23] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby24] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] dev-ruby/i18n:*[ruby_targets_ruby24] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/capistrano-3.10.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a1723b8a2a5a959f5b8928069b8051e
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index 7f47745ef7ae..b602eaabd3b2 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=5
 HOMEPAGE=https://github.com/carllerche/childlabor
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2774f762aecf869488d38345c412c513
+_md5_=37cce8ca05e3e27ed9292427388928e8
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.3 b/metadata/md5-cache/dev-ruby/dbf-3.1.3
deleted file mode 100644
index c2c1c92db76e..000000000000
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
-EAPI=6
-HOMEPAGE=https://github.com/infused/dbf
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/dbf-3.1.3.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8a9f962802e292745bab26cee0f6fb16
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.1 b/metadata/md5-cache/dev-ruby/dbf-4.1.1
deleted file mode 100644
index 86cb3eb97398..000000000000
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
-EAPI=6
-HOMEPAGE=https://github.com/infused/dbf
-IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=mirror://rubygems/dbf-4.1.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8fad42f5801a3d3406c865b65d1b721c
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-5.0.4 b/metadata/md5-cache/dev-ruby/elasticsearch-5.0.4
deleted file mode 100644
index dda39f9bfa49..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-5.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/elasticsearch-api[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/elasticsearch-api[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby integrations for ES, elasticsearch module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/elasticsearch-api[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/elasticsearch-api[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v5.0.4.tar.gz -> elasticsearch-ruby-5.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=edbfa901e5831c9993c90b63f33d73b4
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4 b/metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4
deleted file mode 100644
index c808349d6655..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/multi_json[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/elasticsearch-transport[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/elasticsearch-transport[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v5.0.4.tar.gz -> elasticsearch-ruby-5.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2b8a9f6c695515d7a9861adb2d2ec155
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4
deleted file mode 100644
index c976cab20935..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/faraday[ruby_targets_ruby23] dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/multi_json[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/ansi[ruby_targets_ruby23] dev-ruby/mocha:1.0[ruby_targets_ruby23] dev-ruby/pry[ruby_targets_ruby23] dev-ruby/shoulda-context[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/ansi[ruby_targets_ruby24] dev-ruby/mocha:1.0[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/shoulda-context[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/faraday[ruby_targets_ruby23] dev-ruby/multi_json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/multi_json[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v5.0.4.tar.gz -> elasticsearch-ruby-5.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a079f93244ec0dad1a43194802f82175
diff --git a/metadata/md5-cache/dev-ruby/facter-3.13.2 b/metadata/md5-cache/dev-ruby/facter-3.13.2
new file mode 100644
index 000000000000..593078d62672
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-3.13.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.8:* dev-cpp/cpp-hocon >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.9.6 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=6
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/leatherman-1.0.0:= dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/3.13.2.tar.gz -> facter-3.13.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=9b39ff4cf1c5a5ef0418581702f2c899
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.8.1 b/metadata/md5-cache/dev-ruby/factory_girl-4.8.1
index 3013cfcbc7a4..3c60ba6c69ef 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.8.1
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby23,sqlite] dev-ruby/bourne[ruby_targets_ruby23] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby24,sqlite] dev-ruby/bourne[ruby_targets_ruby24] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby24,sqlite] dev-ruby/bourne[ruby_targets_ruby24] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby25,sqlite] dev-ruby/bourne[ruby_targets_ruby25] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] dev-ruby/timecop[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=factory_girl provides a framework and DSL for defining and using factories
 EAPI=6
 HOMEPAGE=https://github.com/thoughtbot/factory_girl
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/factory_girl/archive/v4.8.1.tar.gz -> factory_girl-4.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=05f537015dcf4797b43c7f3c07110a60
+_md5_=86ccd28173cb55f2885035bde7f723e3
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.18.1 b/metadata/md5-cache/dev-ruby/fakefs-0.18.1
deleted file mode 100644
index 4a22309c8593..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.18.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25] >=dev-ruby/minitest-5.5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26] >=dev-ruby/minitest-5.5[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=6
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v0.18.1.tar.gz -> fakefs-0.18.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4ce0493d6fca398e9870d1d4fc413e9c
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.19.0 b/metadata/md5-cache/dev-ruby/fakefs-0.19.0
deleted file mode 100644
index 35aa27f4b614..000000000000
--- a/metadata/md5-cache/dev-ruby/fakefs-0.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby25] >=dev-ruby/minitest-5.5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26] >=dev-ruby/minitest-5.5[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A fake filesystem. Use it in your tests
-EAPI=6
-HOMEPAGE=https://github.com/defunkt/fakefs
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://github.com/defunkt/fakefs/archive/v0.19.0.tar.gz -> fakefs-0.19.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4ce0493d6fca398e9870d1d4fc413e9c
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.14.0 b/metadata/md5-cache/dev-ruby/faraday-0.14.0
deleted file mode 100644
index 231853dc1ea5..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday-0.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby24] dev-ruby/httpclient[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/net-http-persistent[ruby_targets_ruby24] dev-ruby/patron[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=HTTP/REST API client library with pluggable components
-EAPI=6
-HOMEPAGE=https://github.com/lostisland/faraday
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/lostisland/faraday/archive/v0.14.0.tar.gz -> faraday-0.14.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=107f8f20457b7f11d1a5df864df449c9
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.15.3 b/metadata/md5-cache/dev-ruby/faraday-0.15.3
deleted file mode 100644
index 912b0679e4ef..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday-0.15.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby25] <dev-ruby/multipart-post-3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby23] dev-ruby/httpclient[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/net-http-persistent[ruby_targets_ruby23] dev-ruby/patron[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby24] dev-ruby/httpclient[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/net-http-persistent[ruby_targets_ruby24] dev-ruby/patron[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby25] dev-ruby/httpclient[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/sinatra[ruby_targets_ruby25] dev-ruby/net-http-persistent[ruby_targets_ruby25] dev-ruby/patron[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=HTTP/REST API client library with pluggable components
-EAPI=6
-HOMEPAGE=https://github.com/lostisland/faraday
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby23] <dev-ruby/multipart-post-3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby24] <dev-ruby/multipart-post-3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby25] <dev-ruby/multipart-post-3[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/lostisland/faraday/archive/v0.15.3.tar.gz -> faraday-0.15.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1947563bad99dc98cf0a2419c9b793d3
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.21 b/metadata/md5-cache/dev-ruby/ffi-1.9.21
deleted file mode 100644
index 1545c51b5200..000000000000
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
-EAPI=6
-HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=virtual/libffi ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/ffi/ffi/archive/1.9.21.tar.gz -> ffi-git-1.9.21.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0024241d408013e9eae2ac42da6edaf0
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.22 b/metadata/md5-cache/dev-ruby/ffi-1.9.22
deleted file mode 100644
index 6ddd485722af..000000000000
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
-EAPI=6
-HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=virtual/libffi ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/ffi/ffi/archive/1.9.22.tar.gz -> ffi-git-1.9.22.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0024241d408013e9eae2ac42da6edaf0
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.23 b/metadata/md5-cache/dev-ruby/ffi-1.9.23
deleted file mode 100644
index 0da2ed4fd7ff..000000000000
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
-EAPI=6
-HOMEPAGE=https://wiki.github.com/ffi/ffi
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=virtual/libffi ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/ffi/ffi/archive/1.9.23.tar.gz -> ffi-git-1.9.23.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2516bc1563516d88b63a855631ed6806
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.3 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.3
deleted file mode 100644
index 377355dda2ba..000000000000
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/railties-3.2:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Font-awesome for the asset pipeline
-EAPI=6
-HOMEPAGE=https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64
-LICENSE=MIT OFL
-RDEPEND=ruby_targets_ruby23? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/railties-3.2:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/railties-3.2:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/font-awesome-rails-4.7.0.3.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8c5dfff7404ae95e268c7de43534c82d
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
index 42416b5f1ba8..0c6eb4b834b3 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A GPG backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/sihil/hiera-eyaml-gpg
-IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby24] ) ruby_targets_ruby23? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby25] ) ruby_targets_ruby24? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/gpgme-2.0.0[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.6.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9a00e54e8be8e305a35659b9288868fb
+_md5_=b9d7a28ba452ab182308e0647fbb13cf
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5-r2 b/metadata/md5-cache/dev-ruby/listen-3.1.5-r2
deleted file mode 100644
index 00fbed7fc47b..000000000000
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby25] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/thor[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/thor[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/thor[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Listens to file modifications and notifies you about the changes
-EAPI=6
-HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby25] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=353abeee38c58d49c1ceb4bd741ba15a
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5-r3 b/metadata/md5-cache/dev-ruby/listen-3.1.5-r3
index f57aadd00a94..08ad41081b9c 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5-r3
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=6
 HOMEPAGE=https://github.com/guard/listen
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby25] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby26] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=115ef2e8635df5c5fb67865729d5105e
+_md5_=d25a2a4fa2ede32a44856dd193e21219
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.12.2 b/metadata/md5-cache/dev-ruby/multi_json-1.12.2
deleted file mode 100644
index ff75d8d47a56..000000000000
--- a/metadata/md5-cache/dev-ruby/multi_json-1.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/yajl-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/yajl-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=6
-HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/intridea/multi_json/archive/v1.12.2.tar.gz -> multi_json-1.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=469a3c45274dc234cc2a2993a8c5f41e
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.13.0 b/metadata/md5-cache/dev-ruby/multi_json-1.13.0
deleted file mode 100644
index 046825018f4d..000000000000
--- a/metadata/md5-cache/dev-ruby/multi_json-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] dev-ruby/yajl-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] dev-ruby/yajl-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=6
-HOMEPAGE=https://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/intridea/multi_json/archive/v1.13.0.tar.gz -> multi_json-1.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=469a3c45274dc234cc2a2993a8c5f41e
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
index fbe77c8e24d8..a1d82c717c64 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to l
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
 IUSE=mysql mariadb elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.10.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f45a271cfdf0261bb4fde423753d9234
+_md5_=aa0956b6b11acdb7d2a404f6f2a0ea18
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
index 0418c33c906b..bbbe71e7e242 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to l
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
 IUSE=mysql mariadb elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0.5
 SRC_URI=mirror://rubygems/mysql2-0.5.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b63d34e84b5c787ce6e0e6ac477ec728
+_md5_=a17bcf965af05432025a5a6491587ae5
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1
deleted file mode 100644
index 059d35a62e61..000000000000
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby bindings for Neovim
-EAPI=5
-HOMEPAGE=https://github.com/alexgenco/neovim-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/neovim-0.5.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cf735a4fa5b7c9549ae9e224f1c8e1a2
diff --git a/metadata/md5-cache/dev-ruby/psych-2.2.4 b/metadata/md5-cache/dev-ruby/psych-2.2.4
deleted file mode 100644
index 1dac12e8fe97..000000000000
--- a/metadata/md5-cache/dev-ruby/psych-2.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libyaml-0.1.7 ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A libyaml wrapper for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/tenderlove/psych
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/tenderlove/psych/archive/v2.2.4.tar.gz -> psych-2.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ef2ad0df2c4ecd7637df1b12af3b42dc
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.7.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.7.1
deleted file mode 100644
index 26fe8facd357..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
-EAPI=6
-HOMEPAGE=https://github.com/rtomayko/rack-cache
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~arm64 ~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_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1.2
-SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.7.1.tar.gz -> rack-cache-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d0e4f1020749b04b8d0a2631170107c3
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.7.2 b/metadata/md5-cache/dev-ruby/rack-cache-1.7.2
deleted file mode 100644
index 16fa223a2ace..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/maxitest[ruby_targets_ruby25] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby25] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
-EAPI=6
-HOMEPAGE=https://github.com/rtomayko/rack-cache
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~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_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=1.2
-SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.7.2.tar.gz -> rack-cache-1.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48c283e2aad82115fdf689318bcd5ef9
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.9.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.9.0
index b00f4c01d389..3fa6735de839 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.9.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshne
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/rack-cache
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.9.0.tar.gz -> rack-cache-1.9.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8fb810530691d3883b692c6135646eca
+_md5_=4c2e67b339cf993fb68957c89052be44
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.0.0 b/metadata/md5-cache/dev-ruby/rack-test-1.0.0
index 79babe56618f..714163a08b39 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.0.0
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Rack::Test is a small, simple testing API for Rack apps
 EAPI=6
 HOMEPAGE=https://github.com/rack-test/rack-test
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby25] <dev-ruby/rack-3:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.0.0.tar.gz -> rack-test-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=721ba6a7f3fa363986ae429eb38e0c42
+_md5_=cb222385c72b9ae0157bafa5761b4bae
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.4 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.4
index 4f7bc0d64183..2c7bc56170dd 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.4
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Sanitize HTML fragments in Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9bd5f348e45f4e27548c7df681043e6c
+_md5_=d988e04a5494879c4a5b65c9fd1485a9
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.5 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.5
deleted file mode 100644
index c98cd1bcc7d3..000000000000
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] dev-ruby/rspec:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
-EAPI=6
-HOMEPAGE=https://github.com/luislavena/rake-compiler
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.0.5.tar.gz -> rake-compiler-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=84c4b548004e66170688f6087653eb43
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.6 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.6
deleted file mode 100644
index 06cea8b58bce..000000000000
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] dev-ruby/rspec:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] dev-ruby/rspec:2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
-EAPI=6
-HOMEPAGE=https://github.com/luislavena/rake-compiler
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.0.6.tar.gz -> rake-compiler-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e94266246dac2f9188021c2433239e55
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10-r1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10-r1
deleted file mode 100644
index 04d10df031ac..000000000000
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
-EAPI=5
-HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rb-inotify-0.9.10.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=852b1f23f2a0cbc6e184db96f29028a0
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.0.5 b/metadata/md5-cache/dev-ruby/request_store-1.0.5
index 566c732ebcdc..fe9766f3eeee 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.0.5
+++ b/metadata/md5-cache/dev-ruby/request_store-1.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Per-request global storage for Rack
 EAPI=5
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.0.5
 SRC_URI=mirror://rubygems/request_store-1.0.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a6c34689de181bb1c8b72ca40a7b5145
+_md5_=7382532127e4f4a5d138087959b73cd2
diff --git a/metadata/md5-cache/dev-ruby/rex-powershell-0.1.80 b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.80
new file mode 100644
index 000000000000..99a5950cc8ae
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rex-powershell-0.1.80
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rex-random_identifier[ruby_targets_ruby23] dev-ruby/rex-text[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-random_identifier[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-random_identifier[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/rex-powershell
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/rex-powershell-0.1.80.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8cecf3211f47b3845f85ba90cb8c3b3b
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.2.2 b/metadata/md5-cache/dev-ruby/roadie-3.2.2
deleted file mode 100644
index 3faf9264d66a..000000000000
--- a/metadata/md5-cache/dev-ruby/roadie-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby24] =dev-ruby/css_parser-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Making HTML emails comfortable for the Rails rockstars
-EAPI=6
-HOMEPAGE=https://github.com/Mange/roadie
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby24] =dev-ruby/css_parser-1*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/Mange/roadie/archive/v3.2.2.tar.gz -> roadie-3.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2dbfecfb4d54959bce0886d5e1b767ce
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.3.0 b/metadata/md5-cache/dev-ruby/roadie-3.3.0
deleted file mode 100644
index cf0bba13e3bd..000000000000
--- a/metadata/md5-cache/dev-ruby/roadie-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby24] =dev-ruby/css_parser-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Making HTML emails comfortable for the Rails rockstars
-EAPI=6
-HOMEPAGE=https://github.com/Mange/roadie
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby24] =dev-ruby/css_parser-1*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/Mange/roadie/archive/v3.3.0.tar.gz -> roadie-3.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2dbfecfb4d54959bce0886d5e1b767ce
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1 b/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
deleted file mode 100644
index b7df393ad259..000000000000
--- a/metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
-EAPI=5
-HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/jneen/rouge/archive/v1.11.1.tar.gz -> rouge-1.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e9db07a03b7e01cb44323ea923e53714
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.2.0 b/metadata/md5-cache/dev-ruby/rouge-2.2.0
deleted file mode 100644
index 51b480a311c5..000000000000
--- a/metadata/md5-cache/dev-ruby/rouge-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://rubygems/rouge-2.2.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48fdea41fedf482cf3d46967cd51c013
diff --git a/metadata/md5-cache/dev-ruby/rouge-2.2.1 b/metadata/md5-cache/dev-ruby/rouge-2.2.1
deleted file mode 100644
index 31dd72b07c68..000000000000
--- a/metadata/md5-cache/dev-ruby/rouge-2.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/jneen/rouge
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/redcarpet[ruby_targets_ruby23] !!dev-ruby/rouge:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!dev-ruby/rouge:0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://rubygems/rouge-2.2.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48fdea41fedf482cf3d46967cd51c013
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.3.0 b/metadata/md5-cache/dev-ruby/rouge-3.3.0
new file mode 100644
index 000000000000..fb8b957172cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rouge-3.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!<dev-ruby/rouge-1.11.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] !!<dev-ruby/rouge-1.11.1-r2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26] !!<dev-ruby/rouge-1.11.1-r2:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
+EAPI=6
+HOMEPAGE=https://github.com/jneen/rouge
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] !!<dev-ruby/rouge-1.11.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] !!<dev-ruby/rouge-1.11.1-r2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26] !!<dev-ruby/rouge-1.11.1-r2:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://rubygems/rouge-3.3.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f7846891603a5880ab0971e97e7998d1
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.8.0
deleted file mode 100644
index 181382406e07..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] =dev-ruby/rspec-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.8.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby24] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby24] ~dev-ruby/rspec-rails-3.8.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby25] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby25] ~dev-ruby/rspec-rails-3.8.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=RSpec's official Ruby on Rails plugin
-EAPI=6
-HOMEPAGE=http://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] =dev-ruby/rspec-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.8.0.tar.gz -> rspec-rails-3.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ba577a2800cf6414dc49b62d96f79179
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.8.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.8.1
deleted file mode 100644
index e8a7daaa1c7f..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] =dev-ruby/rspec-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.8.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby24] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby24] ~dev-ruby/rspec-rails-3.8.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby25] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby25] ~dev-ruby/rspec-rails-3.8.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=RSpec's official Ruby on Rails plugin
-EAPI=6
-HOMEPAGE=https://rspec.info/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby24] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby24] >=dev-ruby/railties-3.0:*[ruby_targets_ruby24] =dev-ruby/rspec-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby25] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby25] >=dev-ruby/railties-3.0:*[ruby_targets_ruby25] =dev-ruby/rspec-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.8.1.tar.gz -> rspec-rails-3.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fa2bd9c3dcdf3600c6cadb32785bc4e6
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
deleted file mode 100644
index a6a5966cd72e..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A Ruby library for Oracle OCI8
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~x86
-LICENSE=Ruby
-RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-oci8-2.2.4.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f0b4b1119de99d5929076b7f3ebfc874
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
index 01ad2841814e..83bfb8499a6d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for Oracle OCI8
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Ruby
 RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.5.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5d85168ad81a6f0572009afef0ce5a2b
+_md5_=771891c0340a709d1d6f43e1dd026cdd
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.7 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.7
new file mode 100644
index 000000000000..c1e1a4ec5e72
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Ruby library for Oracle OCI8
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/ruby-oci8/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=Ruby
+RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/ruby-oci8-2.2.7.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=52d05470773899944ddaeacbb103083d
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
deleted file mode 100644
index 95fdd6a64d8a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Generates readable ruby from ParseTree
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=mirror://rubygems/ruby2ruby-2.4.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7b6094d141b54a4cef356fc2e0087313
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
deleted file mode 100644
index e8b8ac398a0e..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26] >=dev-ruby/sexp_processor-4.10.0:4[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Generates readable ruby from ParseTree
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=2
-SRC_URI=mirror://rubygems/ruby2ruby-2.4.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f9e4488477f3aa58c48a09092603e43d
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1
deleted file mode 100644
index 6cea5074f805..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.10.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c3f39841d222d808d5c0b1f7611b506f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.11.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.11.0
deleted file mode 100644
index b1d95bd76d1b..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/racc[ruby_targets_ruby25] >=dev-ruby/minitest-4.3[ruby_targets_ruby25] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby25] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.11.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aec490cc5f8b7a8fc91ab43ad051cb1e
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.12.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.12.0
deleted file mode 100644
index fa8189c893c9..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/racc[ruby_targets_ruby25] >=dev-ruby/minitest-4.3[ruby_targets_ruby25] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26] >=dev-ruby/minitest-4.3[ruby_targets_ruby26] >=dev-ruby/sexp_processor-4.10.1:4[ruby_targets_ruby26] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=6
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.12.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=82d1044bceb206b39c247518af4d3555
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
deleted file mode 100644
index 9cd852fe3558..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby25] dev-ruby/hoe-seattlerb[ruby_targets_ruby25] >=dev-ruby/minitest-5.5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=6
-HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=4
-SRC_URI=mirror://rubygems/sexp_processor-4.10.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b6f01be8c481d6b7ce5dd112f51c989b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.10.1
deleted file mode 100644
index 2e56386476f8..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby25] dev-ruby/hoe-seattlerb[ruby_targets_ruby25] >=dev-ruby/minitest-5.5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=6
-HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=4
-SRC_URI=mirror://rubygems/sexp_processor-4.10.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7b6551dd0e2d98117b9a53297ab1e4e5
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.11.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.11.0
deleted file mode 100644
index 08d86cefe663..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=6
-HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=4
-SRC_URI=mirror://rubygems/sexp_processor-4.11.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c4372f81c3075bdd764c0af95b5b707d
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2
deleted file mode 100644
index bee1caa6afd4..000000000000
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Making tests easy on the fingers and eyes
-EAPI=6
-HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=mirror://rubygems/shoulda-matchers-3.1.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=265389379da9b8db85b714864a5ef940
diff --git a/metadata/md5-cache/dev-ruby/slop-4.4.3 b/metadata/md5-cache/dev-ruby/slop-4.4.3
deleted file mode 100644
index dcebe72b425d..000000000000
--- a/metadata/md5-cache/dev-ruby/slop-4.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A simple option parser with an easy to remember syntax and friendly API
-EAPI=6
-HOMEPAGE=https://github.com/injekt/slop
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=4
-SRC_URI=https://github.com/injekt/slop/archive/v4.4.3.tar.gz -> slop-4.4.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c3f092ecbe11b8897179b4faee845300
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.2 b/metadata/md5-cache/dev-ruby/test-unit-3.3.2
new file mode 100644
index 000000000000..0d0c0e693a37
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=An xUnit family unit testing framework for Ruby
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/test-unit
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby GPL-2 ) PSF-2
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/power_assert[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/power_assert[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/test-unit-3.3.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4061f59947a264b1a3796b8da2801f2e
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.0 b/metadata/md5-cache/dev-ruby/thor-0.20.0
deleted file mode 100644
index 11b067ede316..000000000000
--- a/metadata/md5-cache/dev-ruby/thor-0.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/childlabor[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A scripting framework that replaces rake and sake
-EAPI=6
-HOMEPAGE=http://whatisthor.com/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.0.tar.gz -> thor-git-0.20.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5890ea9772eb4e106d814b3b1dc6c855
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.3 b/metadata/md5-cache/dev-ruby/thor-0.20.3
index f923e3eb71e7..880c98971ea5 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.3
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.3
@@ -4,11 +4,11 @@ DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
 IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.3.tar.gz -> thor-git-0.20.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1386a16c3c8725ce4bb913c26aab80a3
+_md5_=23b46d79ed3721803cca1ad5cfe34109
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9 b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
deleted file mode 100644
index b589609ca0c0..000000000000
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] >=dev-ruby/faraday-0.9[ruby_targets_ruby24] >=dev-ruby/sinatra-1.3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Runs HTTP requests in parallel while cleanly encapsulating handling logic
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/typhoeus/ https://github.com/typhoeus/typhoeus
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/typhoeus-0.6.9.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ededa988a23c3f925f37460eb25351b
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.3.0 b/metadata/md5-cache/dev-ruby/typhoeus-1.3.0
deleted file mode 100644
index f9e82e1dc8f7..000000000000
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/json[ruby_targets_ruby23] >=dev-ruby/faraday-0.9[ruby_targets_ruby23] >=dev-ruby/sinatra-1.3[ruby_targets_ruby23] >=dev-ruby/redis-3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/json[ruby_targets_ruby24] >=dev-ruby/faraday-0.9[ruby_targets_ruby24] >=dev-ruby/sinatra-1.3[ruby_targets_ruby24] >=dev-ruby/redis-3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Runs HTTP requests in parallel while cleanly encapsulating handling logic
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/typhoeus/ https://github.com/typhoeus/typhoeus
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1
-SRC_URI=mirror://rubygems/typhoeus-1.3.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d1373e10c11b0c53a34d83e707ec754e
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
index 8911cddac5fc..94b0a78d9373 100644
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Records your test suite's HTTP interactions and replay them during t
 EAPI=6
 HOMEPAGE=https://github.com/vcr/vcr/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d06e39ff2063ee08ee0f01544c601348
+_md5_=1d3b56b378112ddf0805a7dc033d95bf
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2
deleted file mode 100644
index 3304e6732eaf..000000000000
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/shoulda[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A library to help write robots.txt compliant web robots
-EAPI=5
-HOMEPAGE=https://github.com/knu/webrobots
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/webrobots-0.1.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=993ee3d5a2d0ea3bdb344edaa5cc2b94
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
index 8bb879fbd88f..a7bfb6333249 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to help write robots.txt compliant web robots
 EAPI=5
 HOMEPAGE=https://github.com/knu/webrobots
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b717d446c3e30020e5718edeab015885
+_md5_=d56ad7ceb5e0086dbe750b10ef531f99
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6ae7c302fca9..43ee1768fae6 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/cucumber-3.0.2-r1 b/metadata/md5-cache/dev-util/cucumber-3.0.2-r1
deleted file mode 100644
index 08891494823b..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-3.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.8.6:0[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.8.6:0[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.0[ruby_targets_ruby23] dev-util/cucumber-expressions:4.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.0[ruby_targets_ruby24] dev-util/cucumber-expressions:4.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Executable feature scenarios
-EAPI=6
-HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.0[ruby_targets_ruby23] dev-util/cucumber-expressions:4.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby23] dev-ruby/gherkin:4[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.0[ruby_targets_ruby24] dev-util/cucumber-expressions:4.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby24] dev-ruby/gherkin:4[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.0.2.tar.gz -> cucumber-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b84e6c44b39c38c8e39d06b274968f76
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
deleted file mode 100644
index 98a7dbb91b2c..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-3:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Executable feature scenarios for Rails
-EAPI=6
-HOMEPAGE=https://github.com/cucumber/cucumber/wikis
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby23] <dev-util/cucumber-4[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby23] <dev-ruby/capybara-3:*[ruby_targets_ruby23] >=dev-ruby/railties-4:*[ruby_targets_ruby23] <dev-ruby/railties-5.2:*[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-util/cucumber-1.3.8[ruby_targets_ruby24] <dev-util/cucumber-4[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/capybara-1.1.2:*[ruby_targets_ruby24] <dev-ruby/capybara-3:*[ruby_targets_ruby24] >=dev-ruby/railties-4:*[ruby_targets_ruby24] <dev-ruby/railties-5.2:*[ruby_targets_ruby24] >=dev-ruby/mime-types-1.17:*[ruby_targets_ruby24] <dev-ruby/mime-types-4:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-RESTRICT=test
-SLOT=1
-SRC_URI=mirror://rubygems/cucumber-rails-1.5.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ef81d5483ae0b580bbedd33439ac238e
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
deleted file mode 100644
index a6977b98917d..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Cucumber tag expressions for ruby
-EAPI=6
-HOMEPAGE=https://docs.cucumber.io/tag-expressions/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1
-SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.0.1.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=906810e4b34828fe62970a9eb90b0043
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0
deleted file mode 100644
index 34d73fc9bb89..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Cucumber tag expressions for ruby
-EAPI=6
-HOMEPAGE=https://docs.cucumber.io/tag-expressions/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1
-SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=906810e4b34828fe62970a9eb90b0043
diff --git a/metadata/md5-cache/dev-util/debugedit-4.14.2 b/metadata/md5-cache/dev-util/debugedit-4.14.2
deleted file mode 100644
index 7e786ff078fa..000000000000
--- a/metadata/md5-cache/dev-util/debugedit-4.14.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 dev-libs/elfutils dev-libs/nss virtual/pkgconfig
-DESCRIPTION=Stand-alone debugedit from RPM
-EAPI=7
-HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 dev-libs/elfutils dev-libs/nss
-SLOT=0
-SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=d6d26eee0fe9186b63f8b5a4e53cb402
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.0.8 b/metadata/md5-cache/dev-util/drone-cli-1.0.8
new file mode 100644
index 000000000000..8a1e9e69e4fc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/drone-cli-1.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!<dev-util/drone-0.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone-cli/archive/v1.0.8.tar.gz -> drone-cli-1.0.8.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=68036157c37cd25758b11c642b13703c
diff --git a/metadata/md5-cache/dev-util/hxtools-20121125-r1 b/metadata/md5-cache/dev-util/hxtools-20121125-r1
deleted file mode 100644
index f66e533eb3bd..000000000000
--- a/metadata/md5-cache/dev-util/hxtools-20121125-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl sys-libs/libcap >=sys-libs/libhx-3.12.1 sys-apps/pciutils
-DESCRIPTION=A collection of tools and scripts
-EAPI=5
-HOMEPAGE=http://inai.de/projects/hxtools/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl sys-libs/libcap >=sys-libs/libhx-3.12.1 sys-apps/pciutils
-SLOT=0
-SRC_URI=http://jftp.inai.de/hxtools/hxtools-20121125.tar.xz
-_md5_=eb1001d509fecaa9522b2473d80dfd44
diff --git a/metadata/md5-cache/dev-util/meson-0.49.2 b/metadata/md5-cache/dev-util/meson-0.49.2
index a29822c5c147..d800b5f29e69 100644
--- a/metadata/md5-cache/dev-util/meson-0.49.2
+++ b/metadata/md5-cache/dev-util/meson-0.49.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.49.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cd54aa513904066ff558d7d2cb552ea9
+_md5_=a28ac9ec5287ceb5c03798f39ce86216
diff --git a/metadata/md5-cache/dev-util/repo-1.13.2 b/metadata/md5-cache/dev-util/repo-1.13.2
new file mode 100644
index 000000000000..c00e1a168616
--- /dev/null
+++ b/metadata/md5-cache/dev-util/repo-1.13.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !app-admin/radmind
+DESCRIPTION=Google tool for managing git, particularly multiple repos
+EAPI=7
+HOMEPAGE=https://android.googlesource.com/tools/repo
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !app-admin/radmind
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dlan/distfiles/repo-1.13.2.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=dcbb0fa13b59e4320129c74405e6baa2
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 921172733f16..45a1ed3855ce 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/git-2.21.0 b/metadata/md5-cache/dev-vcs/git-2.21.0
index 8ece88ccdc73..eee2ff64180d 100644
--- a/metadata/md5-cache/dev-vcs/git-2.21.0
+++ b/metadata/md5-cache/dev-vcs/git-2.21.0
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.21.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.21.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.21.0.tar.xz )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=3c73e00f98b56dedeb936466d3b19397
+_md5_=66d2c7ef171a894befcaf93ddc17bd64
diff --git a/metadata/md5-cache/dev-vcs/git-num-2.0.1 b/metadata/md5-cache/dev-vcs/git-num-2.0.1
index 60e45a2c9858..27d546918185 100644
--- a/metadata/md5-cache/dev-vcs/git-num-2.0.1
+++ b/metadata/md5-cache/dev-vcs/git-num-2.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-vcs/git ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( dev-vcs/git ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Quickly reference files in Git using numbers
 EAPI=5
 HOMEPAGE=https://github.com/schreifels/git-num
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-vcs/git ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-vcs/git ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/schreifels/git-num/archive/v2.0.1.tar.gz -> git-num-2.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9cb5ac927a9de6f59d78879e5f03754d
+_md5_=ccec9011a85c73310013a96c1f5c3c74
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index b28bc67d4331..62ce365e25df 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/lugaru-20151204-r1 b/metadata/md5-cache/games-action/lugaru-20151204-r1
index a51d5cf14dc7..f9673f257d36 100644
--- a/metadata/md5-cache/games-action/lugaru-20151204-r1
+++ b/metadata/md5-cache/games-action/lugaru-20151204-r1
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng:0 media-libs/libsdl[opengl,video] media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=media-libs/libpng:0= media-libs/libsdl:=[opengl,video] media-libs/libvorbis:= media-libs/openal:= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl virtual/pkgconfig
 DESCRIPTION=3D arcade with unique fighting system and anthropomorphic characters
-EAPI=6
+EAPI=7
 HOMEPAGE=https://bitbucket.org/osslugaru/lugaru/wiki/Home
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ free-noncomm CC-BY-SA-3.0
-RDEPEND=media-libs/libpng:0 media-libs/libsdl[opengl,video] media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl
+RDEPEND=media-libs/libpng:0= media-libs/libsdl:=[opengl,video] media-libs/libvorbis:= media-libs/openal:= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl
 SLOT=0
 SRC_URI=mirror://gentoo/lugaru-20151204.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fca604332d3d779934925b8a9e444289
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6a68e4697f4f0a2c0fa0d30f0d1e5d01
diff --git a/metadata/md5-cache/games-action/minetest-5.0.1 b/metadata/md5-cache/games-action/minetest-5.0.1
deleted file mode 100644
index 1d2db3023350..000000000000
--- a/metadata/md5-cache/games-action/minetest-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-db/sqlite:3 dev-libs/gmp:0= sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An InfiniMiner/Minecraft inspired game
-EAPI=7
-HOMEPAGE=https://www.minetest.net
-IUSE=+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
-RDEPEND=dev-db/sqlite:3 dev-libs/gmp:0= sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
-SLOT=0
-SRC_URI=https://github.com/minetest/minetest/archive/5.0.1.tar.gz -> minetest-5.0.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7d39933b862cfc3a420ef0603d1620e2
diff --git a/metadata/md5-cache/games-action/minetest-5.0.1-r1 b/metadata/md5-cache/games-action/minetest-5.0.1-r1
new file mode 100644
index 000000000000..cf55dbf14670
--- /dev/null
+++ b/metadata/md5-cache/games-action/minetest-5.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-db/sqlite:3 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An InfiniMiner/Minecraft inspired game
+EAPI=7
+HOMEPAGE=https://www.minetest.net
+IUSE=+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
+RDEPEND=dev-db/sqlite:3 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 dev-games/irrlicht media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
+SLOT=0
+SRC_URI=https://github.com/minetest/minetest/archive/5.0.1.tar.gz -> minetest-5.0.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=929d1e40ab3de9f909f000efdc1d4bfa
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 49ec535b180d..cf214f3d4d26 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/performous-1.1-r1 b/metadata/md5-cache/games-arcade/performous-1.1-r1
index d2376dbb371b..ab5be8193426 100644
--- a/metadata/md5-cache/games-arcade/performous-1.1-r1
+++ b/metadata/md5-cache/games-arcade/performous-1.1-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost[threads(+)] dev-lib
 SLOT=0
 SRC_URI=https://github.com/performous/performous/archive/1.1.tar.gz -> performous-1.1.tar.gz songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=90a6cc262d11359e5fde6e163d4935a1
+_md5_=b166e36d6aa4ca40ff5ef8549b2353b2
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 23c7384bee24..41ea1e00eab6 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/dev-lang/tcc-0.9.26-r1 b/metadata/md5-cache/games-board/grhino-0.16.1-r2
similarity index 53%
rename from metadata/md5-cache/dev-lang/tcc-0.9.26-r1
rename to metadata/md5-cache/games-board/grhino-0.16.1-r2
index 9596800e8778..3c0aa47d24a8 100644
--- a/metadata/md5-cache/dev-lang/tcc-0.9.26-r1
+++ b/metadata/md5-cache/games-board/grhino-0.16.1-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A very small C compiler for ix86/amd64
-EAPI=5
-HOMEPAGE=https://bellard.org/tcc/
-IUSE=test
+DEFINED_PHASES=configure prepare
+DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Reversi game for GNOME, supporting the Go/Game Text Protocol
+EAPI=6
+HOMEPAGE=http://rhino.sourceforge.net/
+IUSE=nls
 KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!dev-lang/tendra
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.26.tar.bz2
+SRC_URI=mirror://sourceforge/rhino/grhino-0.16.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7128ac2ba73c5085b46b90e54401f4fe
+_md5_=79a800f1a0f21690bb8597f757e717e7
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 924e1e163f07..c0b66535066b 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/lolcat-90.8.8 b/metadata/md5-cache/games-misc/lolcat-90.8.8
index 550071a00cf3..712c045ec599 100644
--- a/metadata/md5-cache/games-misc/lolcat-90.8.8
+++ b/metadata/md5-cache/games-misc/lolcat-90.8.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby23] >=dev-ruby/paint-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby24] >=dev-ruby/paint-2.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby24] >=dev-ruby/paint-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby25] >=dev-ruby/paint-2.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby26] >=dev-ruby/paint-2.0.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Rainbows and unicorns!
 EAPI=6
 HOMEPAGE=https://github.com/busyloop/lolcat
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby23] >=dev-ruby/paint-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby24] >=dev-ruby/paint-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby24] >=dev-ruby/paint-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby25] >=dev-ruby/paint-2.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby26] >=dev-ruby/paint-2.0.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-90.8.8.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3fe942566cbfc4996f2ac97ee091eb31
+_md5_=cdc187248fd75be29d9084dd09bb3f94
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 13d6ff1c5cbe..3ed7ce65a607 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.26.2-r2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
index cff4be565678..d841b44faff2 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
 IUSE=debug +introspection seccomp udev test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] seccomp? ( sys-apps/bubblewrap )
 SLOT=3/12
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-desktop-3.26.2-patchset-r1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5ad7149ef32a24e13b013ee3b387efcc
+_md5_=5eee36f5c613d832166f071612b2c75e
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r1 b/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r1
new file mode 100644
index 000000000000..60a19cce4d6a
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/sassc dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.30.1:0/3[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 media-libs/libcanberra[gtk3] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/mesa dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.30.1:0/3[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 media-libs/libcanberra[gtk3] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/mesa >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ?? ( elogind systemd )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.30/gnome-shell-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.30.2-patchset-r1.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=86e533aef9984e23349cd4a47c7f5d80
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r2 b/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r2
deleted file mode 100644
index 24d04f4c2ea0..000000000000
--- a/metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( app-misc/tracker:0/100 ) xmp? ( >=media-libs/exempi-2.1.0:2 ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
-IUSE=exif gnome +introspection packagekit +previewer selinux sendto tracker xmp test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
-RDEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( app-misc/tracker:0/100 ) xmp? ( >=media-libs/exempi-2.1.0:2 ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dcbed6e2063800c3a4093ad8b5c6a5bf
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 239beb1a2e2e..6f5f7ca0913e 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.24.1-r1 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
deleted file mode 100644
index 334190a6d566..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 app-misc/tracker:0/100[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:= || ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
-IUSE=kernel_linux
-KEYWORDS=amd64
-LICENSE=LGPL-2+
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 app-misc/tracker:0/100[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:=
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=19ddb2e54e68f955119883987374ee17
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3 b/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
deleted file mode 100644
index 12effd03e6bf..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] <dev-libs/gjs-1.53 >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:0/100[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] <app-text/libgepub-0.5 dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A document manager application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] <dev-libs/gjs-1.53 >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:0/100[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] <app-text/libgepub-0.5 net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1458ba635e8c1daa82445e7be1a14a93
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0 b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
index 539a31db2062..e664f31cfdd3 100644
--- a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext dev-util/glib-utils >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Lightweight HTML rendering/printing/editing engine
 EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gtkhtml
+HOMEPAGE=https://gitlab.gnome.org/Archive/gtkhtml
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=30314b1d283702fb379e155c42be41ff
+_md5_=36f4e15cd1ffa5d767205058a2774da7
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1 b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
index e5498935e2fa..e776aa3d539f 100644
--- a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-2.0.0 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext dev-util/glib-utils >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Lightweight HTML rendering/printing/editing engine
 EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gtkhtml
+HOMEPAGE=https://gitlab.gnome.org/Archive/gtkhtml
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-2.0.0 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=232dcbf05b9098841c38c4027a3ec7d9
+_md5_=484a1a2ca9afacdfe47602272afdce9d
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.6.4 b/metadata/md5-cache/gnome-extra/nemo-3.6.4
deleted file mode 100644
index 7114db5e3dae..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-3.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=exif +introspection +nls packagekit tracker xmp test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=42f518b76df6b22af38f417520f724cd
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1 b/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1
deleted file mode 100644
index d5ebf749ac2d..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-3.8.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=exif +introspection +nls packagekit selinux tracker xmp test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/3.8.5.tar.gz -> nemo-3.8.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=88070e6a7b390b9f8593f802eca66249
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.8.6 b/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
similarity index 66%
rename from metadata/md5-cache/gnome-extra/nemo-3.8.6
rename to metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
index 66ba53fd01d6..0df8e332f502 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.8.6
+++ b/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
@@ -7,9 +7,9 @@ IUSE=exif +introspection +nls packagekit selinux tracker xmp test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.8.6.tar.gz -> nemo-3.8.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=88070e6a7b390b9f8593f802eca66249
+_md5_=002e6526edf46658ac643544b5f44271
diff --git a/metadata/md5-cache/gnome-extra/nemo-4.0.2 b/metadata/md5-cache/gnome-extra/nemo-4.0.2
deleted file mode 100644
index bba9b1719d57..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.4.0 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) || ( dev-lang/python:3.6 dev-lang/python:3.5 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=6
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=exif +introspection +nls packagekit selinux tracker xmp test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.4.0 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:0/100 ) xmp? ( >=media-libs/exempi-2.2.0:= ) selinux? ( sys-libs/libselinux ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/4.0.2.tar.gz -> nemo-4.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=25c40b8eb0a0fa208b29febe2e371dba
diff --git a/metadata/md5-cache/gnome-extra/nemo-4.0.6 b/metadata/md5-cache/gnome-extra/nemo-4.0.6
index 2e6db79eb6dd..a1c876a0ff88 100644
--- a/metadata/md5-cache/gnome-extra/nemo-4.0.6
+++ b/metadata/md5-cache/gnome-extra/nemo-4.0.6
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/4.0.6.tar.gz -> nemo-4.0.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	e53acc5913e5581a8a71be22731d8f36	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8648b4619c194f63ff5acda4a3c4df3c
+_md5_=6d19d36c148a4518d1fb5fee8b80e9f0
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 1f2686faa068..5b06d5df3f85 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/opendmarc-1.3.2-r2 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
index 1989ab12a15f..81eb16b2c079 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Open source DMARC implementation
 EAPI=6
 HOMEPAGE=http://www.trusteddomain.org/opendmarc/
 IUSE=spf +reports static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=2ce89220b7ffca5dd5ee44f74b8149e4
+_md5_=12a675264fa735896dbd6b1942488a3d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index dd07cd17aff0..e0a83900948d 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/protonmail-bridge-bin-1.1.4 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4
new file mode 100644
index 000000000000..f8b93f646191
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=7
+HOMEPAGE=https://protonmail.com/bridge/
+KEYWORDS=~amd64
+LICENSE=MIT protonmail-bridge-EULA
+RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://protonmail.com/download/protonmail-bridge-1.1.4-1.x86_64.rpm
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_md5_=e9986f7a6cdcf1a04d86b96c04f2aa41
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ced76abe3477..43a4e8be541c 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/dcraw-9.28.0-r1 b/metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
new file mode 100644
index 000000000000..44e3f9ca22ef
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) gimp? ( virtual/pkgconfig )
+DEFINED_PHASES=compile install prepare
+DEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) jpeg2k? ( media-libs/jasper:= ) gimp? ( media-gfx/gimp )
+DESCRIPTION=Command-line decoder for raw digital photos
+EAPI=7
+HOMEPAGE=https://www.cybercom.net/~dcoffin/dcraw/
+IUSE=nls gimp jpeg jpeg2k lcms
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) jpeg2k? ( media-libs/jasper:= ) gimp? ( media-gfx/gimp ) media-libs/netpbm
+SLOT=0
+SRC_URI=https://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.28.0.tar.gz mirror://gentoo/parse-1.73.tar.bz2 gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=138886c658403f4974f7b7a207d4662d
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.24.6 b/metadata/md5-cache/media-gfx/gnome-photos-3.24.6
deleted file mode 100644
index d54daf692fe7..000000000000
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.24.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-misc/tracker:0/100[miner-fs] >=dev-libs/glib-2.44:2 gnome-base/gsettings-desktop-schemas >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw] media-libs/gexiv2 >=media-libs/grilo-0.3.0:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 sci-geosciences/geocode-glib >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22.15:3 app-text/yelp-tools dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/intltool-0.50.1 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Access, organize and share your photos on GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Photos
-IUSE=flickr test upnp-av test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=app-misc/tracker:0/100[miner-fs] >=dev-libs/glib-2.44:2 gnome-base/gsettings-desktop-schemas >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] media-libs/babl >=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw] media-libs/gexiv2 >=media-libs/grilo-0.3.0:0.3= >=media-libs/libpng-1.6:0= >=net-libs/gnome-online-accounts-3.8:= >=net-libs/libgfbgraph-0.2.1:0.2 sci-geosciences/geocode-glib >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22.15:3 net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=94a3323390d9b7d7bb32d4eea2387fad
diff --git a/metadata/md5-cache/media-gfx/maim-5.5.1 b/metadata/md5-cache/media-gfx/maim-5.5.1
index 363b614ff444..a477512da28a 100644
--- a/metadata/md5-cache/media-gfx/maim-5.5.1
+++ b/metadata/md5-cache/media-gfx/maim-5.5.1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposi
 SLOT=0
 SRC_URI=https://github.com/naelstrof/maim/archive/v5.5.1.tar.gz -> maim-5.5.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0255094c3f02cef3299ada28eac2c4c3
+_md5_=34d0efdc5fe76a7b19064cd100fc0959
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0fe6d7002709..dc68907759a9 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/ctl-1.5.2-r1 b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
index 76256ae80294..6af433a6c43f 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/o
 DESCRIPTION=AMPAS' Color Transformation Language
 EAPI=6
 HOMEPAGE=https://github.com/ampas/CTL
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd
 LICENSE=AMPAS
 RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz -> ctl-1.5.2.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9b564442d04ffd3dccf8008a96887da3
+_md5_=801c61b72065ffbf214dba667fe2ef43
diff --git a/metadata/md5-cache/media-libs/jpeg-8d-r1 b/metadata/md5-cache/media-libs/jpeg-8d-r1
deleted file mode 100644
index 64a328be0813..000000000000
--- a/metadata/md5-cache/media-libs/jpeg-8d-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!media-libs/libjpeg-turbo:0 >=app-portage/elt-patches-20170815
-DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
-EAPI=5
-HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=IJG
-RDEPEND=!media-libs/libjpeg-turbo:0
-SLOT=0
-SRC_URI=http://www.ijg.org/files/jpegsrc.v8d.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ba8f454892e9b17865dce6864cd2578b
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.2 b/metadata/md5-cache/media-libs/mesa-19.0.2
new file mode 100644
index 000000000000..c3b8c8ade077
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) 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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+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_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) 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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic 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_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.2.tar.xz
+_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=e9ec4e27c76fafdc3622212b636a070e
diff --git a/metadata/md5-cache/media-libs/ming-0.20181112 b/metadata/md5-cache/media-libs/ming-0.20181112
index ec95d2a99636..41d1ecd23699 100644
--- a/metadata/md5-cache/media-libs/ming-0.20181112
+++ b/metadata/md5-cache/media-libs/ming-0.20181112
@@ -4,7 +4,7 @@ DESCRIPTION=An Open Source library for Flash movie generation
 EAPI=6
 HOMEPAGE=http://ming.sourceforge.net/
 IUSE=+perl php +python static-libs python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 PDEPEND=php? ( dev-php/ming-php )
 RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) media-libs/freetype:= media-libs/libpng:0= media-libs/giflib:= sys-libs/zlib:= !media-libs/libswf python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libming/libming/archive/50098023446a5412efcfbd40552821a8cba983a6.tar.gz -> ming-0.20181112.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cbfa2a31115329c41be7b70576e547d8
+_md5_=9032cfa53b6a583bb373a7a30d7faac1
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
deleted file mode 100644
index 27d12dd6ba66..000000000000
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An open-source JPEG 2000 library
-EAPI=6
-HOMEPAGE=https://www.openjpeg.org
-IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
-SLOT=2/7
-SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e1df17f484a56b44e552b3211a523d4c
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.1 b/metadata/md5-cache/media-libs/openjpeg-2.3.1
new file mode 100644
index 000000000000..af3307deedb8
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib:=
+DESCRIPTION=Open-source JPEG 2000 library
+EAPI=7
+HOMEPAGE=https://www.openjpeg.org
+IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib:=
+SLOT=2/7
+SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz -> openjpeg-2.3.1.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/25632d6deca2e567d30ef476b4abe63916c36f6e.tar.gz -> openjpeg-data_20180620.tar.gz )
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=06d76b182a5119c5512f2fb0bf1b7182
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.10 b/metadata/md5-cache/media-libs/tiff-4.0.10
index 318934b65ee5..c6e30c1300e1 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.10
+++ b/metadata/md5-cache/media-libs/tiff-4.0.10
@@ -5,11 +5,11 @@ 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_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=078933990dd78928853e60b7d79b87bf
+_md5_=1b863d10ce1286a53790397e9e6d4767
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 3960a3c5d3f3..2df00b365a69 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/kodi-pvr-nextpvr-3.3.14 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14
new file mode 100644
index 000000000000..41048cddaa5f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's NextPVR client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/3.3.14-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.14.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 127cb8c7c659..0872419a815c 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/wsjtx-2.0.1 b/metadata/md5-cache/media-radio/wsjtx-2.0.1
new file mode 100644
index 000000000000..1d9159e6a202
--- /dev/null
+++ b/metadata/md5-cache/media-radio/wsjtx-2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/hamlib media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Weak signal ham radio communication
+EAPI=6
+HOMEPAGE=http://physics.princeton.edu/pulsar/K1JT/wsjtx.html
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/hamlib media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc doc? ( dev-ruby/asciidoctor )
+SLOT=0
+SRC_URI=mirror://sourceforge/wsjt/wsjtx-2.0.1.tgz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=c489a5676f359cd58b1f62c295e5acde
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8731be54fd56..1f43731d146e 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/gnome-music-3.24.2 b/metadata/md5-cache/media-sound/gnome-music-3.24.2
deleted file mode 100644
index 8ae4f2d5ca43..000000000000
--- a/metadata/md5-cache/media-sound/gnome-music-3.24.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-misc/tracker-1.11.1:0/100[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] >=dev-util/intltool-0.26 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music management for Gnome
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Music
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-misc/tracker-1.11.1:0/100[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) x11-libs/libnotify[introspection] dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] 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_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5e5188b74cd28574a7d953832425f29a
diff --git a/metadata/md5-cache/media-sound/lmms-1.2.0_rc8 b/metadata/md5-cache/media-sound/lmms-1.2.0_rc8
index 635123c592c0..586a9bc784d1 100644
--- a/metadata/md5-cache/media-sound/lmms-1.2.0_rc8
+++ b/metadata/md5-cache/media-sound/lmms-1.2.0_rc8
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-qt/qtx11extras:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cross-platform music production software
 EAPI=7
 HOMEPAGE=https://lmms.io
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media
 SLOT=0
 SRC_URI=https://github.com/LMMS/lmms/releases/download/v1.2.0-rc8/lmms_1.2.0.rc7.1.tar.xz -> lmms-1.2.0_rc8.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c259132739b205eccf8de67a3b84e3c3
+_md5_=4a603479be64d65f521877449e40f5a1
diff --git a/metadata/md5-cache/media-sound/lmms-9999 b/metadata/md5-cache/media-sound/lmms-9999
index 0fb50460648a..d413a132f277 100644
--- a/metadata/md5-cache/media-sound/lmms-9999
+++ b/metadata/md5-cache/media-sound/lmms-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-qt/qtx11extras:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Cross-platform music production software
 EAPI=7
 HOMEPAGE=https://lmms.io
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9e7233ce3b13b03ebede1b210728dfb9
+_md5_=816acb9ac3313b39f90239fed1b1e63c
diff --git a/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1 b/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
index e5e6a5145ab3..027bb94b5f60 100644
--- a/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
+++ b/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
@@ -5,10 +5,10 @@ DESCRIPTION=An MP3 technical info viewer and ID3 1.x tag editor
 EAPI=7
 HOMEPAGE=https://ibiblio.org/mp3info/
 IUSE=gtk
-KEYWORDS=amd64 ~hppa ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 hppa ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= gtk? ( >=x11-libs/gtk+-2.6.10:2 )
 SLOT=0
 SRC_URI=https://ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/mp3info-0.8.5a.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=0fc7e131be9ff2e0856b7236b2f0426a
+_md5_=360e198ff428239627ddeb1b465472a7
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index cef36985a956..7d0260f3201e 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/tcpreplay-4.3.2 b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.2
index 7e355ff2d329..1a7cbc1f3c30 100644
--- a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.2
+++ b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.2
@@ -5,10 +5,10 @@ DESCRIPTION=utilities for editing and replaying previously captured network traf
 EAPI=7
 HOMEPAGE=http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay
 IUSE=debug pcapnav +tcpdump
-KEYWORDS=amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm ~sparc x86
 LICENSE=BSD GPL-3
 RDEPEND=>=sys-devel/autogen-5.18.4[libopts] dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav )
 SLOT=0
 SRC_URI=https://github.com/appneta/tcpreplay/releases/download/v4.3.2/tcpreplay-4.3.2.tar.xz -> tcpreplay-4.3.2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f258b5e46988521a5f51f025f1c34022
+_md5_=6f4eafbdd1e802612c1d7c07e3a8774d
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.1 b/metadata/md5-cache/net-analyzer/wireshark-3.0.1
index fcad84cea14d..9c74ace6587c 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.0.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) 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 ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/3.0.1
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.1.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=aa7e0b2a54fa3d8b2baf3df4fbe85b4b
+_md5_=22c1533b13100f9b3cb87ec14df6c464
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 62cfb1643d2a..2786b1e80dbc 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/libidn2-2.1.1a b/metadata/md5-cache/net-dns/libidn2-2.1.1a
index 5f5b4b89e58e..1fd535cbf108 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.1.1a
+++ b/metadata/md5-cache/net-dns/libidn2-2.1.1a
@@ -5,10 +5,10 @@ DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn2-2.1.1a.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=8b2de55c5d9b0be91827f511a2e2d278
+_md5_=4244149bfa6a04a3bf1b9543ff471fc1
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.10 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.10
deleted file mode 100644
index 9cf294d73ece..000000000000
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:=
-DESCRIPTION=The PowerDNS Recursor
-EAPI=7
-HOMEPAGE=https://www.powerdns.com/
-IUSE=libressl luajit protobuf snmp sodium systemd
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.1.10.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=0adfeba4e2f243a2197d55b482d6856e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b277f979939f..b75e542eb4ee 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/skypeforlinux-8.34.0.78 b/metadata/md5-cache/net-im/skypeforlinux-8.34.0.78-r1
similarity index 51%
rename from metadata/md5-cache/net-im/skypeforlinux-8.34.0.78
rename to metadata/md5-cache/net-im/skypeforlinux-8.34.0.78-r1
index cf59b95e618e..ad15af4b787d 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.34.0.78
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.34.0.78-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.skype.com/
 IUSE=pax_kernel abi_x86_64
 KEYWORDS=-* ~amd64
 LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=|| ( sys-auth/elogind sys-apps/systemd ) dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+RDEPEND=|| ( sys-auth/elogind[abi_x86_64(-)?] sys-apps/systemd[abi_x86_64(-)?] ) dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[policykit,abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.34.0.78-1.x86_64.rpm
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f40f04c908c498c91f646a3321f1efc3
+_md5_=3e8a911fc7b041c3ac1ae061c23a4f51
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c5c72f113f6c..b23f22153e60 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/gnutls-3.6.7 b/metadata/md5-cache/net-libs/gnutls-3.6.7
index 8c0cb79f4022..314d5fd5b575 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.6.7
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.7
@@ -5,11 +5,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=7
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.7.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4d0bf8dc742ca4a4026fb4d320427918
+_md5_=8ee3e166e7cf5135c23181c72def843d
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.12.10 b/metadata/md5-cache/net-libs/gupnp-av-0.12.10
deleted file mode 100644
index 412d96b88692..000000000000
--- a/metadata/md5-cache/net-libs/gupnp-av-0.12.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.34:2 >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Utility library aiming to ease the handling UPnP A/V profiles
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.34:2 >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-1.36:= ) !net-libs/gupnp-vala
-SLOT=0/2
-SRC_URI=mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.10.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vala	a94a0fb4c35fe91774bb72ec8f3c861f	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=879a1609f718f7a47742cffaa1efee5b
diff --git a/metadata/md5-cache/net-libs/http-parser-2.9.1 b/metadata/md5-cache/net-libs/http-parser-2.9.1
new file mode 100644
index 000000000000..17e3f5f580dd
--- /dev/null
+++ b/metadata/md5-cache/net-libs/http-parser-2.9.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP request/response parser for C
+EAPI=7
+HOMEPAGE=https://github.com/nodejs/http-parser
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris
+LICENSE=MIT
+SLOT=0/2.9.0
+SRC_URI=https://github.com/nodejs/http-parser/archive/v2.9.1.tar.gz -> http-parser-2.9.1.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=40fc4523ee4be9f836bcc486d58e43ca
diff --git a/metadata/md5-cache/net-libs/libiio-0.15-r1 b/metadata/md5-cache/net-libs/libiio-0.15-r1
index b65be7e9488d..90ff08025eb2 100644
--- a/metadata/md5-cache/net-libs/libiio-0.15-r1
+++ b/metadata/md5-cache/net-libs/libiio-0.15-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Library for interfacing with IIO devices
 EAPI=6
 HOMEPAGE=https://github.com/analogdevicesinc/libiio
-IUSE=+aio +avahi
+IUSE=+aio +zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi )
+RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi )
 SLOT=0/0.15
 SRC_URI=https://github.com/analogdevicesinc/libiio/archive/v0.15.tar.gz -> libiio-0.15.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5ae092314e87999c2ee80648c0575359
+_md5_=c823754baa74b9d0636f3292fcfaebc7
diff --git a/metadata/md5-cache/net-libs/libiio-9999 b/metadata/md5-cache/net-libs/libiio-9999
index 1aa1bc245638..7d6cd1222c86 100644
--- a/metadata/md5-cache/net-libs/libiio-9999
+++ b/metadata/md5-cache/net-libs/libiio-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Library for interfacing with IIO devices
 EAPI=6
 HOMEPAGE=https://github.com/analogdevicesinc/libiio
-IUSE=+aio +avahi
+IUSE=+aio +zeroconf
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi )
+RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi )
 SLOT=0/9999
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5ae092314e87999c2ee80648c0575359
+_md5_=c823754baa74b9d0636f3292fcfaebc7
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
deleted file mode 100644
index ccd1b8670d9a..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180503.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=3b13cc770ab6231246a0d4fb90dabc76
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190403 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190403
deleted file mode 100644
index fa85e58d0270..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190403
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190403.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=a4616e6e9ae302aaa1107b81b83f5ae3
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 206c899d143f..02439dde45a2 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/aria2-1.34.0 b/metadata/md5-cache/net-misc/aria2-1.34.0
deleted file mode 100644
index 217a164206ab..000000000000
--- a/metadata/md5-cache/net-misc/aria2-1.34.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.12.0:0 )
-DESCRIPTION=A download utility with segmented downloading with BitTorrent support
-EAPI=6
-HOMEPAGE=https://aria2.github.io/
-IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
-REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=53afd03b58164d67400fdddda8ef1254
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.7.4 b/metadata/md5-cache/net-misc/cni-plugins-0.7.4
deleted file mode 100644
index 65d7b2f6fda5..000000000000
--- a/metadata/md5-cache/net-misc/cni-plugins-0.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standard networking plugins for container networking
-EAPI=6
-HOMEPAGE=https://github.com/containernetworking/plugins
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/containernetworking/plugins/archive/v0.7.4.tar.gz -> cni-plugins-0.7.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=029cc0936a906a4566576b35b9b80ae2
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0 b/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
deleted file mode 100644
index ef965d34f6a0..000000000000
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-misc/tracker-1:0/100 >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Crawls through your online content
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
-IUSE=flickr
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-misc/tracker-1:0/100 >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2c3cf0b06ee32329455a0b7776d7d804
diff --git a/metadata/md5-cache/net-misc/istioctl-1.1.2 b/metadata/md5-cache/net-misc/istioctl-1.1.2
new file mode 100644
index 000000000000..751777433007
--- /dev/null
+++ b/metadata/md5-cache/net-misc/istioctl-1.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Istio configuration command line utility
+EAPI=6
+HOMEPAGE=https://github.com/istio/istio
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/istio/istio/archive/1.1.2.tar.gz -> istioctl-1.1.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=35cfd25dd3d568ea6a2607afbc37079c
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190210 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190210
deleted file mode 100644
index 81c13fec0b4e..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190210
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190210.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4e4c4b5fc43de15ed2240c8af922dd16
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190403 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190403
deleted file mode 100644
index 508a9eb27af1..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190403
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190403.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4e4c4b5fc43de15ed2240c8af922dd16
diff --git a/metadata/md5-cache/net-misc/rygel-0.34.0 b/metadata/md5-cache/net-misc/rygel-0.34.0
deleted file mode 100644
index 890f011de86d..000000000000
--- a/metadata/md5-cache/net-misc/rygel-0.34.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:0/100 ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 ) dev-util/gtk-doc-am >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
-IUSE=X +introspection +sqlite tracker test transcode test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:0/100 ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/rygel/0.34/rygel-0.34.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5bb2a7c77af93c10888f898356c67589
diff --git a/metadata/md5-cache/net-misc/socat-1.7.3.3 b/metadata/md5-cache/net-misc/socat-1.7.3.3
new file mode 100644
index 000000000000..05930077c4bf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/socat-1.7.3.3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 setup
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=Multipurpose relay (SOcket CAT)
+EAPI=7
+HOMEPAGE=http://www.dest-unreach.org/socat/
+IUSE=bindist libressl ssl readline ipv6 tcpd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
+RESTRICT=test ssl? ( readline? ( bindist ) )
+SLOT=0
+SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.3.3.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=3797ac394201e33bcbdb274606799004
diff --git a/metadata/md5-cache/net-misc/wget-1.20.3 b/metadata/md5-cache/net-misc/wget-1.20.3
index 46e815eb702e..59f9a9e3c13a 100644
--- a/metadata/md5-cache/net-misc/wget-1.20.3
+++ b/metadata/md5-cache/net-misc/wget-1.20.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.20.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=27492b545c2abdac913c468ab83fd355
+_md5_=429d1162328d33fc74b85fdcef4a6709
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.04.01 b/metadata/md5-cache/net-misc/youtube-dl-2019.04.01
deleted file mode 100644
index 85db0beb16bd..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.04.01
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2019.04.01/youtube-dl-2019.04.01.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=add3ae47fe0b271fbbf2b11491b3d7d3
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.04.07 b/metadata/md5-cache/net-misc/youtube-dl-2019.04.07
index 9bc9edca04e3..5442b232cb3d 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.04.07
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.04.07
@@ -5,7 +5,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://rg3.github.com/youtube-dl/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2019.04.07/youtube-dl-2019.04.07.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=a247cd4592a786616a1d9bb97a026ae4
+_md5_=add3ae47fe0b271fbbf2b11491b3d7d3
diff --git a/metadata/md5-cache/perl-core/Archive-Tar-2.300.0 b/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
index f290a7d10a13..e34ee208368b 100644
--- a/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
+++ b/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module for creation and manipulation of tar files
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Archive-Tar
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IO-Compress-2.15.0 >=virtual/perl-IO-Zlib-1.10.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.30.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=45b5303cc44fee04c8aec617ace7c90e
+_md5_=7b733757554f8434b3d681bc5c5710d7
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 6ddb8d49841e..a66307f554bb 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/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 256142363177..e3ef6b575cca 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/gle-4.2.5-r1 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
index 034fe18ecbee..3da9342e0af6 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png?
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2c468d2147f07dbdb950e6cd01a160d
+_md5_=062d82c6ebaa4cd451a8a95d3941fa61
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4d258f79e545..0422e13fe0ae 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/bubblewrap-0.3.1-r1 b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
index 445a1117b744..39140b3f2443 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solutio
 EAPI=7
 HOMEPAGE=https://github.com/projectatomic/bubblewrap
 IUSE=selinux +suid kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/bubblewrap/releases/download/v0.3.1/bubblewrap-0.3.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=4a6f13c7c5265ca1cd6c86e4606b03d2
+_md5_=f48562e2ab370593f3c81f6fdaf5b0fd
diff --git a/metadata/md5-cache/sys-apps/collectl-4.3.1 b/metadata/md5-cache/sys-apps/collectl-4.3.1
index 7168812f7ded..ca47f335bef4 100644
--- a/metadata/md5-cache/sys-apps/collectl-4.3.1
+++ b/metadata/md5-cache/sys-apps/collectl-4.3.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
 EAPI=6
 HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~x86
 LICENSE=GPL-2 Artistic
 RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
 SLOT=0
 SRC_URI=mirror://sourceforge/collectl/collectl-4.3.1.src.tar.gz
-_md5_=f33e12f6becfe16965177f8a8aebf622
+_md5_=c87465387a9741ab507699a28e3f8623
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33.1 b/metadata/md5-cache/sys-apps/util-linux-2.33.1
index 02fffa718ef6..1a3ad29849b1 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.33.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b39488beecac226ca34ec7879769fe5
+_md5_=a45ec452408bf8fcaa8bd61d9cd78f43
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33.2 b/metadata/md5-cache/sys-apps/util-linux-2.33.2
new file mode 100644
index 000000000000..53c7b2d9718a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33.2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=734faa0b0683cb6f9e68f455f8c843ae
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 3ef8bb9ab7c5..73ea9bef10a5 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-15.0.0 b/metadata/md5-cache/sys-auth/keystone-15.0.0
new file mode 100644
index 000000000000..e538622aa10c
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/keystone-15.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+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_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-5.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.43.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/msgpack-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ldap? ( >=dev-python/python-ldap-3.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.conf.sample -> keystone.conf.sample-15.0.0 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-15.0.0 https://tarballs.openstack.org/keystone/keystone-15.0.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=7981763fb074be457e192e877dd33f2b
diff --git a/metadata/md5-cache/sys-auth/keystone-2019.1.9999 b/metadata/md5-cache/sys-auth/keystone-2019.1.9999
index a4182a5d2f05..c759b001c927 100644
--- a/metadata/md5-cache/sys-auth/keystone-2019.1.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2019.1.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_t
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.conf.sample -> keystone.conf.sample-2019.1.9999 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-2019.1.9999
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=3a77dbd6f71b96f7e60b561a20ed6d10
+_md5_=7981763fb074be457e192e877dd33f2b
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.14 b/metadata/md5-cache/sys-auth/pam_mount-2.14
deleted file mode 100644
index b90c1f90300f..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=4
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt ssl selinux
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.14.tar.xz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=cccef28969e1c871f247c84fc2293664
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.15 b/metadata/md5-cache/sys-auth/pam_mount-2.15
deleted file mode 100644
index dbfb76fed856..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=5
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt ssl selinux
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.12.1 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.15.tar.xz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=f4f20c894ee2e5d41e4e04b34a9b37d9
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c22191f6f544..84bb1e203894 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-14.0.0 b/metadata/md5-cache/sys-cluster/cinder-14.0.0
new file mode 100644
index 000000000000..0291401ab4e3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-14.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=7
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-14.0.0 https://tarballs.openstack.org/cinder/cinder-14.0.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=8774e36dbb96ed643dba6de213e630db
diff --git a/metadata/md5-cache/sys-cluster/cinder-2019.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2019.1.9999
new file mode 100644
index 000000000000..73560fe2be63
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-2019.1.9999
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=7
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-2019.1.9999
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=8774e36dbb96ed643dba6de213e630db
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.14.1 b/metadata/md5-cache/sys-cluster/kubeadm-1.14.1
new file mode 100644
index 000000000000..31b05716aae6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.14.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.1.tar.gz -> kubernetes-1.14.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=fcb6587694b5f25ab39d19a03f0ab955
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.14.1 b/metadata/md5-cache/sys-cluster/kubelet-1.14.1
new file mode 100644
index 000000000000..2aaa7f2c013c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.1.tar.gz -> kubernetes-1.14.1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 588d77914075..2c097e2958f1 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.31.1-r4 b/metadata/md5-cache/sys-devel/binutils-2.31.1-r4
index 6040339bc989..2156917ef5e3 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.31.1-r4
+++ b/metadata/md5-cache/sys-devel/binutils-2.31.1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
 SLOT=2.31
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=47967a9bf5ce52519b65a66909f36f03
+_md5_=5784aabcd785711e907ee715c4d81d43
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index e8882ce1ed80..c2bd82fefa39 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -8,6 +8,6 @@ LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
 SLOT=9999
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-9999-patches-3.tar.xz
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-9999-patches-4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8a8ae7ab9e4f61b3f3cf62f9516e5be9
+_md5_=580c7e6587450002440c29717e6856e9
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
deleted file mode 100644
index 8866c1e997c7..000000000000
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Distribute compilation of C code across several machines on a network
-EAPI=6
-HOMEPAGE=http://distcc.org/
-IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f26edf1c0448fd06515ec3f20e07b8c6
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3 b/metadata/md5-cache/sys-devel/distcc-3.3
deleted file mode 100644
index e406d7c447f1..000000000000
--- a/metadata/md5-cache/sys-devel/distcc-3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) sys-libs/binutils-libs virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Distribute compilation of C code across several machines on a network
-EAPI=6
-HOMEPAGE=http://distcc.org/
-IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3/distcc-3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=41fd75ea5b01d02fff640879adac6d8b
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.2-r4 b/metadata/md5-cache/sys-devel/distcc-3.3.2-r4
deleted file mode 100644
index 68359ec74ea6..000000000000
--- a/metadata/md5-cache/sys-devel/distcc-3.3.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) sys-devel/autoconf-archive sys-libs/binutils-libs virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Distribute compilation of C code across several machines on a network
-EAPI=6
-HOMEPAGE=http://distcc.org/
-IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.2/distcc-3.3.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=baf93a474bf4662307881680a559ed68
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r2 b/metadata/md5-cache/sys-devel/patch-2.7.6-r2
deleted file mode 100644
index 6feaa423e628..000000000000
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=xattr? ( sys-apps/attr ) test? ( sys-apps/ed )
-DESCRIPTION=Utility to apply diffs to files
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/patch/patch.html
-IUSE=static test xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=18fc0dc8fbb09a38ce8e4ea2670e4ddf
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r3 b/metadata/md5-cache/sys-devel/patch-2.7.6-r3
index 0da994086ca8..1dc8bc226ea1 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r3
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to apply diffs to files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 IUSE=static test xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7368fef35ebbada675704f1096d96a5b
+_md5_=3329200b0c8c61aeb79c4b6ef676759d
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 41251d6eca91..ba2f8c33e96b 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/squashfs-tools-4.3_p12 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p12
new file mode 100644
index 000000000000..be0007ba38d3
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+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=http://squashfs.sourceforge.net
+IUSE=debug lz4 lzma lzo static xattr +xz zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-12.debian.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=0063e9b239d2dd1ff8c63a5e7fcaf175
diff --git a/metadata/md5-cache/sys-fs/vhba-20170610 b/metadata/md5-cache/sys-fs/vhba-20170610
deleted file mode 100644
index fab8552ec445..000000000000
--- a/metadata/md5-cache/sys-fs/vhba-20170610
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=virtual/udev virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
-DESCRIPTION=Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-EAPI=6
-HOMEPAGE=http://cdemu.org
-IUSE=kernel_linux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=mirror://sourceforge/cdemu/vhba-module-20170610.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	dc67f5064036fbaf4bb77b68a9caeda0	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5441d840ac12e53c851a60dfffd87f18
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3b3bfeabbf63..ce21b4f37e41 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/linux-firmware-20190409 b/metadata/md5-cache/sys-kernel/linux-firmware-20190409
new file mode 100644
index 000000000000..283c6a1ed32e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20190409
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare unpack
+DESCRIPTION=Linux firmware files
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=savedconfig savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+
+RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-260cb35b11a968e7896f911565b75e411636ad69.tar.gz -> linux-firmware-20190409.tar.gz
+_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
+_md5_=51ad76d4ae013ffbf329cde26e78beec
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2e6079789f25..31f85446702d 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4 b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
index 3b39e7a90304..ee7e80af2941 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.31.1-r1
 SRC_URI=mirror://gnu/binutils/binutils-2.31.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.31.1-patches-5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5405f9259cc424375c40761d4abf6de7
+_md5_=c4100fb79c572ce1d958fe178a631409
diff --git a/metadata/md5-cache/sys-libs/glibc-2.21-r2 b/metadata/md5-cache/sys-libs/glibc-2.21-r2
deleted file mode 100644
index 6c6e67289288..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.21-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=>=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.6 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.21-patches-7.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/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c2150cc01fad9ba36da4d56861f08049
diff --git a/metadata/md5-cache/sys-libs/glibc-2.28-r6 b/metadata/md5-cache/sys-libs/glibc-2.28-r6
index 3053d139a105..2f5fa8693c8d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.28-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.28-r6
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.28.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.28-patches-9.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=378b625e3b9c00fbe868e947b3410406
+_md5_=b54a4b46ccecca6c85d37eee7f31d84d
diff --git a/metadata/md5-cache/sys-libs/libhx-3.16 b/metadata/md5-cache/sys-libs/libhx-3.16
deleted file mode 100644
index 913799f0a76b..000000000000
--- a/metadata/md5-cache/sys-libs/libhx-3.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Platform independent library providing basic system functions
-EAPI=5
-HOMEPAGE=http://libhx.sourceforge.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/libhx/libHX-3.16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c198364d2feb2e81b38da4e761b7d442
diff --git a/metadata/md5-cache/sys-libs/libhx-3.22 b/metadata/md5-cache/sys-libs/libhx-3.22
deleted file mode 100644
index 8054887f3500..000000000000
--- a/metadata/md5-cache/sys-libs/libhx-3.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Platform independent library providing basic system functions
-EAPI=5
-HOMEPAGE=http://libhx.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/libhx/libHX-3.22.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2610dd35e47393d6b1c79da8142e0511
diff --git a/metadata/md5-cache/sys-libs/libhx-3.24 b/metadata/md5-cache/sys-libs/libhx-3.24
index d90dc41e1074..863251acee37 100644
--- a/metadata/md5-cache/sys-libs/libhx-3.24
+++ b/metadata/md5-cache/sys-libs/libhx-3.24
@@ -5,9 +5,9 @@ DESCRIPTION=Platform independent library providing basic system functions
 EAPI=7
 HOMEPAGE=http://libhx.sourceforge.net
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/libhx/libHX-3.24.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=ab1534650521d6de5a74dff56955bf9c
+_md5_=ab92ce13f1bb74731840ab73e7b27770
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.22 b/metadata/md5-cache/sys-libs/musl-1.1.22
new file mode 100644
index 000000000000..604e87902e43
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/musl-1.1.22
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst setup
+DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
+EAPI=6
+HOMEPAGE=http://www.musl-libc.org/
+IUSE=headers-only
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+LICENSE=MIT LGPL-2 GPL-2
+SLOT=0
+SRC_URI=http://www.musl-libc.org/releases/musl-1.1.22.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=eace87bc3b8caab1eb0fcb6e00c467bd
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11 b/metadata/md5-cache/sys-libs/zlib-1.2.11
deleted file mode 100644
index 27375785865b..000000000000
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=minizip? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=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-portage/elt-patches-20170815
-DESCRIPTION=Standard (de)compression library
-EAPI=5
-HOMEPAGE=https://zlib.net/
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=ZLIB
-RDEPEND=!<dev-libs/libxml2-2.7.7
-SLOT=0/1
-SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8419ae93820b1a8a911d8e6271f12343
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
deleted file mode 100644
index ab7ac073ad1e..000000000000
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=minizip? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=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-portage/elt-patches-20170815
-DESCRIPTION=Standard (de)compression library
-EAPI=5
-HOMEPAGE=https://zlib.net/
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=ZLIB
-RDEPEND=!<dev-libs/libxml2-2.7.7
-SLOT=0/1
-SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9191ef3f43dd1f38c6e27c820c7bd0e0
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index b063b4afd3d5..f10305ca8997 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/jpeg-0-r2 b/metadata/md5-cache/virtual/jpeg-0-r2
deleted file mode 100644
index 9b7e0262c159..000000000000
--- a/metadata/md5-cache/virtual/jpeg-0-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages
-EAPI=5
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-8d-r1:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f8cb59fbee9bccdcbc4d0b645ac964b
diff --git a/metadata/md5-cache/virtual/jpeg-0-r3 b/metadata/md5-cache/virtual/jpeg-0-r3
new file mode 100644
index 000000000000..580e2bd94ed0
--- /dev/null
+++ b/metadata/md5-cache/virtual/jpeg-0-r3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages
+EAPI=7
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-9c:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=ba2d97685023879c79b28ce201f6b0c4
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
index fda4f7c83069..ae44a005ad9c 100644
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Archive-Tar
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Archive-Tar-2.300.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.300.0 !>perl-core/Archive-Tar-2.300.0-r999
 SLOT=0
-_md5_=7bbd207d58fb0f8b13b1b17566ade56a
+_md5_=44805792b48c85dee3be16b6cd01368d
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 201905fe788a..b147f181fc9b 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/grafana-bin-6.1.3 b/metadata/md5-cache/www-apps/grafana-bin-6.1.3
new file mode 100644
index 000000000000..0ec9168d76c2
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.1.3
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig
+SLOT=0
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-6.1.3.linux-amd64.tar.gz -> grafana-bin-6.1.3.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=dac823c6db030372368f98087a8558a7
diff --git a/metadata/md5-cache/www-apps/netbox-2.5.10 b/metadata/md5-cache/www-apps/netbox-2.5.10
new file mode 100644
index 000000000000..9a874932994c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/netbox-2.5.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst setup
+DEPEND=>=dev-python/django-2.1.5[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) webhooks? ( dev-python/django-rq )
+DESCRIPTION=IP address and data center infrastructure management tool
+EAPI=7
+HOMEPAGE=https://github.com/digitalocean/netbox
+IUSE=ldap webhooks python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/django-2.1.5[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] ) webhooks? ( dev-python/django-rq )
+SLOT=0
+SRC_URI=https://github.com/digitalocean/netbox/archive/v2.5.10.tar.gz -> netbox-2.5.10.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=158719a0cd68997033a7b4ee1151bd08
diff --git a/metadata/md5-cache/www-apps/piwigo-2.9.5 b/metadata/md5-cache/www-apps/piwigo-2.9.5
new file mode 100644
index 000000000000..5c58e04fa262
--- /dev/null
+++ b/metadata/md5-cache/www-apps/piwigo-2.9.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=a photo gallery software for the web
+EAPI=7
+HOMEPAGE=http://piwigo.org/
+IUSE=+exif +gd imagemagick vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=imagemagick? ( virtual/imagemagick-tools ) dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli] >=virtual/mysql-5.0 virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( gd imagemagick )
+SLOT=2.9.5
+SRC_URI=http://piwigo.org/download/dlcounter.php?code=2.9.5 -> piwigo-2.9.5.zip
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=0798bfa2aa4bf50402b27d62a69ef464
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e599bef12a72..6685251da62e 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/firefox-60.6.1 b/metadata/md5-cache/www-client/firefox-60.6.1
index c5a7fb0709c9..5edf97defd77 100644
--- a/metadata/md5-cache/www-client/firefox-60.6.1
+++ b/metadata/md5-cache/www-client/firefox-60.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Firefox Web Browser
 EAPI=6
 HOMEPAGE=https://www.mozilla.com/firefox
 IUSE=bindist eme-free geckodriver +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.6.1esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.6.1esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.6.1esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.6.1esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.6.1esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.6.1esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.6.1esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.6.1esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.6.1esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.6.1esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.6.1esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.6.1esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.6.1esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.6.1esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.6.1esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.6.1esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.6.1esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.6.1esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.6.1esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.6.1esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.6.1esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.6.1esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.6.1esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.6.1esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.6.1esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.6.1esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.6.1esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.6.1esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.6.1esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.6.1esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.6.1esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.6.1esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.6.1esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.6.1esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.6.1esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.6.1esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.6.1esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.6.1esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.6.1esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.6.1esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.6.1esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.6.1esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.6.1esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.6.1esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.6.1esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.6.1esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.6.1esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.6.1esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.6.1esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.6.1esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.6.1esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.6.1esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.6.1esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.6.1esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.6.1esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.6.1esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.6.1esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.6.1esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.6.1esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.6.1esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.6.1esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.6.1esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.6.1esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.6.1esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.6.1esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.6.1esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.6.1esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.6.1esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.6.1esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.6.1esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.6.1esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.6.1esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.6.1esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.6.1esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.6.1esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.6.1esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.6.1esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.6.1esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.6.1esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.6.1esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.6.1esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.6.1esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.6.1esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.6.1esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.6.1esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.6.1esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.6.1esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.6.1esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.6.1esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.6.1esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.6.1esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/source/firefox-60.6.1esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-03.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	2b2bb73f0d7c508d096467e6abe5c812	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=40247ed44c43d8237cf01931bf8b3bb4
+_md5_=c94f6ef95dc3c69274d9cf8cbff0ae27
diff --git a/metadata/md5-cache/www-client/firefox-66.0.2 b/metadata/md5-cache/www-client/firefox-66.0.2
deleted file mode 100644
index e0839729927d..000000000000
--- a/metadata/md5-cache/www-client/firefox-66.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.42 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:* dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.6.8 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.31.0 >=virtual/rust-1.31.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( dev-lang/nasm ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.42 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:* dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ach.xpi -> firefox-66.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/af.xpi -> firefox-66.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/an.xpi -> firefox-66.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ar.xpi -> firefox-66.0.2-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/as.xpi -> firefox-66.0.2-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ast.xpi -> firefox-66.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/az.xpi -> firefox-66.0.2-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/bg.xpi -> firefox-66.0.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/bn-BD.xpi -> firefox-66.0.2-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/bn-IN.xpi -> firefox-66.0.2-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/br.xpi -> firefox-66.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/bs.xpi -> firefox-66.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ca.xpi -> firefox-66.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/cak.xpi -> firefox-66.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/cs.xpi -> firefox-66.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/cy.xpi -> firefox-66.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/da.xpi -> firefox-66.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/de.xpi -> firefox-66.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/dsb.xpi -> firefox-66.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/el.xpi -> firefox-66.0.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/en-GB.xpi -> firefox-66.0.2-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/en-ZA.xpi -> firefox-66.0.2-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/eo.xpi -> firefox-66.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/es-AR.xpi -> firefox-66.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/es-CL.xpi -> firefox-66.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/es-ES.xpi -> firefox-66.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/es-MX.xpi -> firefox-66.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/et.xpi -> firefox-66.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/eu.xpi -> firefox-66.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/fa.xpi -> firefox-66.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ff.xpi -> firefox-66.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/fi.xpi -> firefox-66.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/fr.xpi -> firefox-66.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-66.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-66.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/gd.xpi -> firefox-66.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/gl.xpi -> firefox-66.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/gn.xpi -> firefox-66.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-66.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/he.xpi -> firefox-66.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-66.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/hr.xpi -> firefox-66.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/hsb.xpi -> firefox-66.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/hu.xpi -> firefox-66.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-66.0.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/id.xpi -> firefox-66.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/is.xpi -> firefox-66.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/it.xpi -> firefox-66.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ja.xpi -> firefox-66.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ka.xpi -> firefox-66.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/kab.xpi -> firefox-66.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/kk.xpi -> firefox-66.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/km.xpi -> firefox-66.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/kn.xpi -> firefox-66.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ko.xpi -> firefox-66.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/lij.xpi -> firefox-66.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/lt.xpi -> firefox-66.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/lv.xpi -> firefox-66.0.2-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/mai.xpi -> firefox-66.0.2-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/mk.xpi -> firefox-66.0.2-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ml.xpi -> firefox-66.0.2-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/mr.xpi -> firefox-66.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ms.xpi -> firefox-66.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-66.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/nl.xpi -> firefox-66.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-66.0.2-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/or.xpi -> firefox-66.0.2-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-66.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/pl.xpi -> firefox-66.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-66.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-66.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/rm.xpi -> firefox-66.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ro.xpi -> firefox-66.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ru.xpi -> firefox-66.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/si.xpi -> firefox-66.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/sk.xpi -> firefox-66.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/sl.xpi -> firefox-66.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/son.xpi -> firefox-66.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/sq.xpi -> firefox-66.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/sr.xpi -> firefox-66.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-66.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/ta.xpi -> firefox-66.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/te.xpi -> firefox-66.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/th.xpi -> firefox-66.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/tr.xpi -> firefox-66.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/uk.xpi -> firefox-66.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/uz.xpi -> firefox-66.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/vi.xpi -> firefox-66.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/xh.xpi -> firefox-66.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-66.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-66.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/66.0.2/source/firefox-66.0.2.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-66.0-patches-09.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db894ce093cecbab4270e9b6a4ea611d
diff --git a/metadata/md5-cache/www-client/firefox-66.0.3 b/metadata/md5-cache/www-client/firefox-66.0.3
new file mode 100644
index 000000000000..8dc676ed1f85
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-66.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.42 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:* dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.6.8 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.31.0 >=virtual/rust-1.31.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( dev-lang/nasm ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.42 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:* dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.26:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ach.xpi -> firefox-66.0.3-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/af.xpi -> firefox-66.0.3-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/an.xpi -> firefox-66.0.3-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ar.xpi -> firefox-66.0.3-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/as.xpi -> firefox-66.0.3-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ast.xpi -> firefox-66.0.3-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/az.xpi -> firefox-66.0.3-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/bg.xpi -> firefox-66.0.3-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/bn-BD.xpi -> firefox-66.0.3-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/bn-IN.xpi -> firefox-66.0.3-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/br.xpi -> firefox-66.0.3-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/bs.xpi -> firefox-66.0.3-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ca.xpi -> firefox-66.0.3-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/cak.xpi -> firefox-66.0.3-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/cs.xpi -> firefox-66.0.3-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/cy.xpi -> firefox-66.0.3-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/da.xpi -> firefox-66.0.3-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/de.xpi -> firefox-66.0.3-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/dsb.xpi -> firefox-66.0.3-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/el.xpi -> firefox-66.0.3-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/en-GB.xpi -> firefox-66.0.3-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/en-ZA.xpi -> firefox-66.0.3-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/eo.xpi -> firefox-66.0.3-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/es-AR.xpi -> firefox-66.0.3-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/es-CL.xpi -> firefox-66.0.3-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/es-ES.xpi -> firefox-66.0.3-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/es-MX.xpi -> firefox-66.0.3-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/et.xpi -> firefox-66.0.3-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/eu.xpi -> firefox-66.0.3-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/fa.xpi -> firefox-66.0.3-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ff.xpi -> firefox-66.0.3-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/fi.xpi -> firefox-66.0.3-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/fr.xpi -> firefox-66.0.3-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/fy-NL.xpi -> firefox-66.0.3-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ga-IE.xpi -> firefox-66.0.3-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/gd.xpi -> firefox-66.0.3-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/gl.xpi -> firefox-66.0.3-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/gn.xpi -> firefox-66.0.3-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/gu-IN.xpi -> firefox-66.0.3-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/he.xpi -> firefox-66.0.3-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/hi-IN.xpi -> firefox-66.0.3-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/hr.xpi -> firefox-66.0.3-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/hsb.xpi -> firefox-66.0.3-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/hu.xpi -> firefox-66.0.3-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/hy-AM.xpi -> firefox-66.0.3-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/id.xpi -> firefox-66.0.3-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/is.xpi -> firefox-66.0.3-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/it.xpi -> firefox-66.0.3-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ja.xpi -> firefox-66.0.3-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ka.xpi -> firefox-66.0.3-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/kab.xpi -> firefox-66.0.3-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/kk.xpi -> firefox-66.0.3-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/km.xpi -> firefox-66.0.3-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/kn.xpi -> firefox-66.0.3-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ko.xpi -> firefox-66.0.3-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/lij.xpi -> firefox-66.0.3-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/lt.xpi -> firefox-66.0.3-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/lv.xpi -> firefox-66.0.3-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/mai.xpi -> firefox-66.0.3-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/mk.xpi -> firefox-66.0.3-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ml.xpi -> firefox-66.0.3-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/mr.xpi -> firefox-66.0.3-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ms.xpi -> firefox-66.0.3-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/nb-NO.xpi -> firefox-66.0.3-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/nl.xpi -> firefox-66.0.3-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/nn-NO.xpi -> firefox-66.0.3-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/or.xpi -> firefox-66.0.3-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/pa-IN.xpi -> firefox-66.0.3-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/pl.xpi -> firefox-66.0.3-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/pt-BR.xpi -> firefox-66.0.3-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/pt-PT.xpi -> firefox-66.0.3-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/rm.xpi -> firefox-66.0.3-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ro.xpi -> firefox-66.0.3-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ru.xpi -> firefox-66.0.3-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/si.xpi -> firefox-66.0.3-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/sk.xpi -> firefox-66.0.3-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/sl.xpi -> firefox-66.0.3-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/son.xpi -> firefox-66.0.3-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/sq.xpi -> firefox-66.0.3-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/sr.xpi -> firefox-66.0.3-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/sv-SE.xpi -> firefox-66.0.3-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/ta.xpi -> firefox-66.0.3-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/te.xpi -> firefox-66.0.3-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/th.xpi -> firefox-66.0.3-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/tr.xpi -> firefox-66.0.3-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/uk.xpi -> firefox-66.0.3-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/uz.xpi -> firefox-66.0.3-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/vi.xpi -> firefox-66.0.3-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/xh.xpi -> firefox-66.0.3-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/zh-CN.xpi -> firefox-66.0.3-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xpi/zh-TW.xpi -> firefox-66.0.3-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/66.0.3/source/firefox-66.0.3.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-66.0-patches-09.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-66.0-patches-09.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	115ba83c0e59f7a089a04f194a0a91d4	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=db894ce093cecbab4270e9b6a4ea611d
diff --git a/metadata/md5-cache/www-client/google-chrome-73.0.3683.86 b/metadata/md5-cache/www-client/google-chrome-73.0.3683.103
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-73.0.3683.86
rename to metadata/md5-cache/www-client/google-chrome-73.0.3683.103
index 208616bd3fdd..97b806c5bbeb 100644
--- a/metadata/md5-cache/www-client/google-chrome-73.0.3683.86
+++ b/metadata/md5-cache/www-client/google-chrome-73.0.3683.103
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk: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 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=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/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_73.0.3683.86-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_73.0.3683.103-1_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.40 b/metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.75
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.40
rename to metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.75
index ae6414a1ebd9..b9b3ef530cb8 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.40
+++ b/metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.75
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk: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 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=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/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_74.0.3729.40-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_74.0.3729.75-1_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-75.0.3745.4 b/metadata/md5-cache/www-client/google-chrome-unstable-75.0.3759.4
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-75.0.3745.4
rename to metadata/md5-cache/www-client/google-chrome-unstable-75.0.3759.4
index f0a449d897d5..bf3e40db036c 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-75.0.3745.4
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-75.0.3759.4
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk: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 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=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/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_75.0.3745.4-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_75.0.3759.4-1_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12 b/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
new file mode 100644
index 000000000000..f49f3379529b
--- /dev/null
+++ b/metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=dev-libs/boehm-gc-7.2 dev-libs/libmoe dev-lang/perl sys-libs/ncurses:0= sys-libs/zlib gpm? ( sys-libs/gpm ) nls? ( sys-devel/gettext ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=A variant of w3m with support for multiple character encodings
+EAPI=6
+HOMEPAGE=http://pub.ks-and-ks.ne.jp/prog/w3mmee/
+IUSE=gpm libressl nls ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=w3m
+RDEPEND=>=dev-libs/boehm-gc-7.2 dev-libs/libmoe dev-lang/perl sys-libs/ncurses:0= sys-libs/zlib gpm? ( sys-libs/gpm ) nls? ( sys-devel/gettext ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=http://pub.ks-and-ks.ne.jp/prog/pub/w3mmee-p24-23.tar.gz
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=455c7c73c1ea356ceddf75891ce9a8c8
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 3775a4a20391..da6c393e79d7 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-73.0.3683.86 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.103
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.86
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.103
index 5afdbf3ed62f..7f2549d270df 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.86
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.103
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_73.0.3683.86-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_73.0.3683.103-1_amd64.deb
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.40_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.75_beta
similarity index 92%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.40_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.75_beta
index afc77895a9a4..b940f75d0a4f 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.40_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.75_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_74.0.3729.40-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_74.0.3729.75-1_amd64.deb
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3745.4_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3759.4_alpha
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3745.4_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3759.4_alpha
index 66f59f46fc68..6cba494a8c9b 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3745.4_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3759.4_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !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_75.0.3745.4-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_75.0.3759.4-1_amd64.deb
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 35f64fcd6c9c..6c81494f694a 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/neXtaw-0.15.1-r3 b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
index b9c8182abbd6..ea3746b497c4 100644
--- a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
+++ b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
@@ -3,9 +3,9 @@ DEPEND=x11-base/xorg-proto x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-l
 DESCRIPTION=Athena Widgets with N*XTSTEP appearance
 EAPI=6
 HOMEPAGE=http://siag.nu/neXtaw/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=BSD
 RDEPEND=x11-base/xorg-proto x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXpm !<x11-libs/neXtaw-0.15.1-r1
 SLOT=0
 SRC_URI=http://siag.nu/pub/neXtaw/neXtaw-0.15.1.tar.gz
-_md5_=8501b94048328aa0674418f74dd4c7a9
+_md5_=0f96d78812b844f68615b419b18f3389
diff --git a/metadata/md5-cache/x11-libs/pixman-0.38.0 b/metadata/md5-cache/x11-libs/pixman-0.38.0
deleted file mode 100644
index 18c285737a0f..000000000000
--- a/metadata/md5-cache/x11-libs/pixman-0.38.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=7
-HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-IUSE=altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/pixman-0.38.0.tar.gz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
-_md5_=28d7559cf9b79dd1a5de1a3136eaf870
diff --git a/metadata/md5-cache/x11-libs/pixman-0.38.2 b/metadata/md5-cache/x11-libs/pixman-0.38.4
similarity index 95%
rename from metadata/md5-cache/x11-libs/pixman-0.38.2
rename to metadata/md5-cache/x11-libs/pixman-0.38.4
index 7bfb5733f9e3..a6090f9cba02 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.38.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.38.4
@@ -7,6 +7,6 @@ IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/pixman-0.38.2.tar.gz
+SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.38.4.tar.gz
 _eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
 _md5_=963ca06e61980baea98c75520f1a247e
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 0ad6d375636a..195dbba26e97 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/rxvt-unicode-9.22 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22
deleted file mode 100644
index 7123a32202fd..000000000000
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.22
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.7-r6:= kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=rxvt clone with xft and unicode support
-EAPI=5
-HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
-IUSE=256-color alt-font-width blink buffer-on-clear +focused-urgency fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel startup-notification xft unicode3 +vanilla wcwidth
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.7-r6:= kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft )
-REQUIRED_USE=vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.22.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc0e1e45b3e2f3ba6d52c7acb32c6e14
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r2 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r2
new file mode 100644
index 000000000000..9ca08040a78f
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft ) virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=rxvt clone with xft and unicode support
+EAPI=7
+HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
+IUSE=256-color blink fading-colors +font-styles iso14755 +mousewheel +perl pixbuf startup-notification unicode3 +utmp +wtmp xft
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.22.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9
+_md5_=979bc14a357e23354164c86bca40e80d
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9999 b/metadata/md5-cache/x11-terms/rxvt-unicode-9999
index d3fb5c56b51c..13b4cc7f70b5 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9999
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 unpack
-DEPEND=media-libs/fontconfig sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXrender kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft ) virtual/pkgconfig x11-base/xorg-proto dev-vcs/cvs
 DESCRIPTION=rxvt clone with xft and unicode support
-EAPI=6
+EAPI=7
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
-IUSE=256-color blink fading-colors +font-styles iso14755 +mousewheel +perl pixbuf startup-notification xft unicode3
+IUSE=256-color blink fading-colors +font-styles iso14755 +mousewheel +perl pixbuf startup-notification unicode3 +utmp +wtmp xft
 LICENSE=GPL-3
-RDEPEND=media-libs/fontconfig sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXrender kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
+RDEPEND=>=sys-libs/ncurses-5.7-r6:= media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a703dfc0fb1ea46bc65622cffdaa8011
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=74f9deb01e3053a5bad39be68b6c65df
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 563c39b9f10a..f783d245f1ff 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2 b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2
new file mode 100644
index 000000000000..372b9f8930af
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=opengl startup-notification +xcomposite +xpresent
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.1.tar.bz2 https://dev.gentoo.org/~mgorny/dist/xfwm4-4.13.1-patchset.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=55fa855ac427e857f42ad0bbd6926b75
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index d278df6df0b8..d11a05949e62 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-notes-plugin-1.8.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
index 0944c6cad87e..a60c716d4fc3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm
 DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= dev-libs/libunique:1= virtual/pkgconfig dev-util/intltool
 DESCRIPTION=Xfce4 panel sticky notes plugin
 EAPI=7
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.1
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.tar.bz2
 _eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5c7d9aa6e5fe054a84ad1e6824934871
+_md5_=5836c46d8de10618ba5ac4125ea37848
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
index d8c3800608e8..e2d0fc800c9e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm
 DEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool virtual/pkgconfig
 DESCRIPTION=A panel plug-in to take periodical breaks from the computer
 EAPI=7
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-ba
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.2.tar.bz2
 _eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=02bb75b414c8a0ec7f0bb4a6be91df61
+_md5_=059fb517182ed2dce9d91246dee5f8c6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
index 48eedcb1a1f9..8442125a4a6c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
@@ -1,5 +1,5 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=postinst prepare setup
+DEFINED_PHASES=postinst postrm prepare setup
 DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-
 SLOT=0
 SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.5.tar.gz -> xfce4-windowck-plugin-0.4.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	b45201c4e6c096b98e250336954e64b9	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=63b1ef6560789fa299cf065240704854
+_md5_=a24188f554cbb7bf46e1286adc8c729c
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1 b/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
index efc7828423b5..8c12b33f578a 100644
--- a/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm
 DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0= >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.10:= dev-util/intltool virtual/pkgconfig
 DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
 EAPI=7
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.6/xfdashboard-0.6.1.tar.bz2
 _eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b074f6646a7f590ed16ab24fc72fbe05
+_md5_=adaedd85fee790d706b548b6195667ae
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5 b/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
index e7e705fadb0a..443d1b2a588e 100644
--- a/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm
 DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.13:= dev-util/intltool virtual/pkgconfig
 DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
 EAPI=7
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-0.7.5.tar.bz2
 _eclasses_=xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4038573ec12dd39a6a8f9cd30d187fd2
+_md5_=8fd5fc27d9ee2264020b41d3707485d4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f02e61e9aa01..5ced877ee4da 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20491 BLAKE2B 9cdef5a1a0bcaa1999e309d2626cf8c01ccdfb7788802a9b258c2b3996d74c0f8be277fc60bccc49cd024985cbee682501e339f3ca637df59a4a9c5cb1dfb219 SHA512 3c2d56a0cb5694828c1da91513ffd08a5cb253b79f56312f0af333fbc1f7470d21c386235e3abd89cb482483ea3d862f69ff90189a53fecc24c6087ed0dcbb1a
-TIMESTAMP 2019-04-10T08:08:45Z
+TIMESTAMP 2019-04-11T21:08:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlytpI1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlyvrN5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAetg//aI8NCqa3BPIwzWHmoexCykVgnb8QYxO854L7aR3TxAhXz5lVGVEuN4Za
-5pxK4uPg/JFraR0KEYLudViCnOONUIAWX0Dq70aawnVU8nwgpAxuXZebCY0QhP/6
-W/tleldXSkIhPKsPiwy8RLH8x2VIlQBfZg3Avp5ohVqab2gtmEWTXBYO1LQ0UKr3
-kkPf2+WTNPJg2T7icBjOorcE1qC2FLH5trBSa5Yt67Uq6ppwXi3O2k3RVD/4jNKd
-M0w1WGNhYO5HchVfHoYLjd8Vvx96l6GWnCXqjEHxemCt1mpuZZ0QpRC6l+0jokfH
-1iNll7xILtmN8aEti+drlymBfJS59LD73CQAxPopJMN5ZR425EaLLYKzJxeJJi29
-+dYeCYYIN81cBsJoFnnnBFmOKXOl4tCq+vafv/5bGILQOTi0UVXY/Q2NYlMueBzA
-shI5oJ64LoWQBBat7BsdqG7zqaqGVQmvL0GlVl0QjqWIRAo9Fd4pOxXyNIdaKnQi
-7mARbH8n5ZWllEifFq4o5PVNh5d/O+FgSb4BsT+zJitnFpc+AlMeJewOhAGHCMSQ
-MTQBDz0GdrGcBP7cEpgNz3c9ydC7Ovjcv6DGJwNNV/AO98aHyueAMuIT3QO8H3qe
-QFyOHOGLxW2N9yj7xJSUxwqWXwLPJdNRJjnVMZUeTsMg883G9ok=
-=3zn/
+klDWbA//bp4A92YF+oqoH9fAgRuiGwHR34+sC2RVeFMfzWl96ruh202yQDmXO9vO
+mwLlACOIS6i08u/1iwAzHKZg5cUrdEPGLOul/WuRvD7NOpNFOEG+1iQrSoARyvPS
+GJOaUlo5I9ow5o3FmfNkRsbp0HACC3ljmu1F/LkSmmNHkRxlzaLdkAm93rohPDxk
+VSENbondMXuwNTAvY7ddGNTDcQP+6YznrNSaw4j8WISTb0i7rSjnd501dozFF+We
+N1D7kemEBdEJdrBMDMbPG24znOfvFI70k2MRmuePdHPX0WkIZPeYRI3Uo2NGiRB2
+xo0+rKzeCrXgD4yopc1n4wMgY5EcAWz58/vC4W28qvyR/IRkJu+L0Ek3KS4HSEue
+XN6y9A72IfXZLDKZzQBGptohZJnsonG0kN2a0/KIbQjLXTNyhGlKVjQD6O9bN1Xe
+k1VpdLTHB8lbvduN+lbuKPwtrnIPjZZN5ulc1rVOV1biQHJ75cgMC6aIY+ug63dm
+5zXxTa9VfEaNHhJkwcy/Jqo9Y7OJacsew9aI2fEizQ7zqKZEgSCTZ0aK00tftcfC
+op+9uBuEyV6kHx53ej8gmvRseX2bJUnq8OTUq6Ektcnx/KT5rb8bwdC0IrVHc8tr
+Ru16o3hvXimBztEHWgCdFnmqBg3rUQZV/orSDm7k5iMGlt22+ck=
+=rVmO
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 71187a58866c..28294eafa631 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Apr 2019 08:08:42 +0000
+Thu, 11 Apr 2019 21:08:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 08638e1ac7c1..a62d220a18f7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Apr 10 08:08:41 UTC 2019
+Thu Apr 11 21:08:42 UTC 2019
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 81a471c2e663..6825be927319 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -1023,6 +1023,7 @@
 1806032109 ./sys-libs/slang/slang-2.3.2.ebuild
 1702282250 ./sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
 1904062339 ./sys-libs/musl/musl-1.1.21.ebuild
+1904102309 ./sys-libs/musl/musl-1.1.22.ebuild
 1812312139 ./sys-libs/musl/musl-1.1.20-r1.ebuild
 1901271909 ./sys-libs/musl/musl-9999.ebuild
 1903311709 ./sys-libs/libsepol/libsepol-9999.ebuild
@@ -1093,7 +1094,7 @@
 1904091739 ./sys-libs/binutils-libs/binutils-libs-2.31.1-r5.ebuild
 1812221509 ./sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
 1801231609 ./sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild
-1904080539 ./sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
+1904110239 ./sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
 1903022239 ./sys-libs/binutils-libs/binutils-libs-2.32.ebuild
 1801231609 ./sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
 1902161709 ./sys-libs/readline/readline-7.0_p5.ebuild
@@ -1187,10 +1188,8 @@
 1803161238 ./sys-libs/libcxxabi/libcxxabi-9999.ebuild
 1704132207 ./sys-libs/csu/csu-79.ebuild
 1806121409 ./sys-libs/csu/csu-85.ebuild
-1811231909 ./sys-libs/libhx/libhx-3.24.ebuild
+1904110139 ./sys-libs/libhx/libhx-3.24.ebuild
 1703101359 ./sys-libs/libhx/libhx-3.22-r1.ebuild
-1702282250 ./sys-libs/libhx/libhx-3.16.ebuild
-1702282250 ./sys-libs/libhx/libhx-3.22.ebuild
 1902191909 ./sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
 1901251639 ./sys-libs/freeipmi/freeipmi-1.6.3.ebuild
 1802031508 ./sys-libs/freeipmi/freeipmi-1.4.8.ebuild
@@ -1223,8 +1222,6 @@
 1702282250 ./sys-libs/musl-nscd/musl-nscd-9999.ebuild
 1702282250 ./sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
 1807152109 ./sys-libs/zlib/zlib-1.2.11-r2.ebuild
-1804201208 ./sys-libs/zlib/zlib-1.2.11.ebuild
-1804201208 ./sys-libs/zlib/zlib-1.2.11-r1.ebuild
 1703262118 ./sys-libs/lwp/lwp-2.6-r1.ebuild
 1805012209 ./sys-libs/lwp/lwp-2.2.ebuild
 1901311039 ./sys-libs/lwp/lwp-2.8.ebuild
@@ -1236,11 +1233,10 @@
 1806090009 ./sys-libs/glibc/glibc-2.23-r4.ebuild
 1902110309 ./sys-libs/glibc/glibc-2.27-r6.ebuild
 1810250109 ./sys-libs/glibc/glibc-2.19-r2.ebuild
-1904081909 ./sys-libs/glibc/glibc-2.28-r6.ebuild
+1904101809 ./sys-libs/glibc/glibc-2.28-r6.ebuild
 1806090009 ./sys-libs/glibc/glibc-2.24-r4.ebuild
 1904072009 ./sys-libs/glibc/glibc-2.29-r2.ebuild
 1903260039 ./sys-libs/glibc/glibc-9999.ebuild
-1806090009 ./sys-libs/glibc/glibc-2.21-r2.ebuild
 1806090009 ./sys-libs/glibc/glibc-2.25-r11.ebuild
 1804201208 ./sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
 1904100039 ./sys-libs/libosinfo/libosinfo-1.3.0.ebuild
@@ -1285,7 +1281,7 @@
 1702282250 ./sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
 1702282250 ./sci-visualization/quickplot/quickplot-0.10.8.ebuild
 1704091404 ./sci-visualization/nonolith-connect/nonolith-connect-1.1.ebuild
-1801131139 ./sci-visualization/gle/gle-4.2.5-r1.ebuild
+1904120009 ./sci-visualization/gle/gle-4.2.5-r1.ebuild
 1904012209 ./sci-visualization/paraview/paraview-5.6.0.ebuild
 1810311839 ./sci-visualization/paraview/paraview-5.5.2.ebuild
 1702282250 ./sci-visualization/gfsview/gfsview-20120706-r1.ebuild
@@ -2010,7 +2006,7 @@
 1807061009 ./dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild
 1902171039 ./dev-ruby/ruby-rsvg/ruby-rsvg-3.3.2.ebuild
 1901271439 ./dev-ruby/request_store/request_store-1.4.1.ebuild
-1708060921 ./dev-ruby/request_store/request_store-1.0.5.ebuild
+1904102039 ./dev-ruby/request_store/request_store-1.0.5.ebuild
 1903291009 ./dev-ruby/activejob/activejob-5.1.7.ebuild
 1903282239 ./dev-ruby/activejob/activejob-5.2.3.ebuild
 1903141039 ./dev-ruby/activejob/activejob-4.2.11.1.ebuild
@@ -2032,10 +2028,9 @@
 1901181439 ./dev-ruby/zentest/zentest-4.11.2.ebuild
 1808240509 ./dev-ruby/zentest/zentest-4.11.1.ebuild
 1903291539 ./dev-ruby/rbst/rbst-0.5.1.ebuild
-1806050738 ./dev-ruby/listen/listen-3.1.5-r2.ebuild
 1812272109 ./dev-ruby/listen/listen-3.1.5-r1.ebuild
 1805030809 ./dev-ruby/listen/listen-0.7.3-r2.ebuild
-1901181139 ./dev-ruby/listen/listen-3.1.5-r3.ebuild
+1904111009 ./dev-ruby/listen/listen-3.1.5-r3.ebuild
 1805030809 ./dev-ruby/listen/listen-1.3.1-r4.ebuild
 1801222238 ./dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
 1901290109 ./dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
@@ -2051,8 +2046,8 @@
 1803222338 ./dev-ruby/mysql2/mysql2-0.4.10.ebuild
 1804130938 ./dev-ruby/mysql2/mysql2-0.5.1.ebuild
 1807080709 ./dev-ruby/mysql2/mysql2-0.5.2.ebuild
-1901311039 ./dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
-1901311039 ./dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
+1904111009 ./dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
+1904111009 ./dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
 1902031409 ./dev-ruby/afm/afm-0.2.2.ebuild
 1901202209 ./dev-ruby/brass/brass-1.2.1.ebuild
 1809172239 ./dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
@@ -2063,11 +2058,8 @@
 1901181139 ./dev-ruby/addressable/addressable-2.6.0.ebuild
 1901101609 ./dev-ruby/addressable/addressable-2.5.2.ebuild
 1811231409 ./dev-ruby/mechanize/mechanize-2.7.6.ebuild
-1803091238 ./dev-ruby/ffi/ffi-1.9.23.ebuild
 1712282339 ./dev-ruby/ffi/ffi-1.9.18.ebuild
 1806090909 ./dev-ruby/ffi/ffi-1.9.25.ebuild
-1802080938 ./dev-ruby/ffi/ffi-1.9.21.ebuild
-1802230938 ./dev-ruby/ffi/ffi-1.9.22.ebuild
 1901091139 ./dev-ruby/ffi/ffi-1.10.0.ebuild
 1902031409 ./dev-ruby/charlock_holmes/charlock_holmes-0.7.6.ebuild
 1902050909 ./dev-ruby/sqlite3/sqlite3-1.4.0.ebuild
@@ -2080,13 +2072,11 @@
 1805142038 ./dev-ruby/net-sftp/net-sftp-2.1.2-r3.ebuild
 1812121339 ./dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
 1809161039 ./dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.4.ebuild
-1801100939 ./dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.3.ebuild
 1702282250 ./dev-ruby/debugger-linecache/debugger-linecache-1.2.0.ebuild
 1901142009 ./dev-ruby/windows_error/windows_error-0.1.2.ebuild
 1901121139 ./dev-ruby/http-form_data/http-form_data-2.1.1.ebuild
 1803222338 ./dev-ruby/http-form_data/http-form_data-1.0.3.ebuild
 1901281009 ./dev-ruby/psych/psych-3.1.0.ebuild
-1803160038 ./dev-ruby/psych/psych-2.2.4.ebuild
 1810200839 ./dev-ruby/psych/psych-3.0.3.ebuild
 1803222338 ./dev-ruby/mini_mime/mini_mime-1.0.0.ebuild
 1901211009 ./dev-ruby/mini_mime/mini_mime-1.0.1.ebuild
@@ -2146,8 +2136,6 @@
 1901201339 ./dev-ruby/ruby-ole/ruby-ole-1.2.12.1.ebuild
 1903250909 ./dev-ruby/moneta/moneta-1.1.0.ebuild
 1902011409 ./dev-ruby/moneta/moneta-1.0.0.ebuild
-1812241009 ./dev-ruby/rake-compiler/rake-compiler-1.0.6.ebuild
-1809011009 ./dev-ruby/rake-compiler/rake-compiler-1.0.5.ebuild
 1712292110 ./dev-ruby/rake-compiler/rake-compiler-1.0.2.ebuild
 1901131139 ./dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild
 1802211108 ./dev-ruby/vcard/vcard-0.2.15.ebuild
@@ -2158,25 +2146,19 @@
 1901201339 ./dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
 1901091139 ./dev-ruby/atomic/atomic-1.1.101.ebuild
 1902011509 ./dev-ruby/log4r/log4r-1.1.10-r2.ebuild
-1804060808 ./dev-ruby/roadie/roadie-3.3.0.ebuild
 1807020839 ./dev-ruby/roadie/roadie-3.4.0.ebuild
-1802101108 ./dev-ruby/roadie/roadie-3.2.2.ebuild
 1901201339 ./dev-ruby/spork/spork-0.9.2-r2.ebuild
 1802091008 ./dev-ruby/redis/redis-3.3.5.ebuild
 1804102338 ./dev-ruby/redis/redis-4.0.1.ebuild
 1901211009 ./dev-ruby/rbpdf/rbpdf-1.19.7.ebuild
 1812081109 ./dev-ruby/rbpdf/rbpdf-1.19.6.ebuild
-1903202209 ./dev-ruby/multi_json/multi_json-1.12.2.ebuild
-1903202209 ./dev-ruby/multi_json/multi_json-1.13.0.ebuild
 1903202209 ./dev-ruby/multi_json/multi_json-1.13.1.ebuild
 1903202209 ./dev-ruby/multi_json/multi_json-1.12.1.ebuild
 1804291308 ./dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
 1809130909 ./dev-ruby/litc/litc-1.0.3-r1.ebuild
 1903282309 ./dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
 1903282309 ./dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
-1806301309 ./dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
 1902170309 ./dev-ruby/typhoeus/typhoeus-0.6.9-r1.ebuild
-1804192308 ./dev-ruby/typhoeus/typhoeus-1.3.0.ebuild
 1902170309 ./dev-ruby/typhoeus/typhoeus-1.3.1.ebuild
 1901181139 ./dev-ruby/parallel/parallel-1.13.0.ebuild
 1903250909 ./dev-ruby/parallel/parallel-1.15.0.ebuild
@@ -2206,12 +2188,9 @@
 1901032239 ./dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
 1902251009 ./dev-ruby/mini_magick/mini_magick-4.9.3.ebuild
 1901032239 ./dev-ruby/mini_magick/mini_magick-4.9.2.ebuild
-1707230821 ./dev-ruby/ruby_parser/ruby_parser-3.10.1.ebuild
 1712212239 ./dev-ruby/ruby_parser/ruby_parser-3.9.0.ebuild
 1903131009 ./dev-ruby/ruby_parser/ruby_parser-3.13.0.ebuild
-1901250939 ./dev-ruby/ruby_parser/ruby_parser-3.12.0.ebuild
 1903261139 ./dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
-1802241038 ./dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild
 1901271439 ./dev-ruby/rex-core/rex-core-0.1.13.ebuild
 1902021109 ./dev-ruby/hamster/hamster-3.0.0-r1.ebuild
 1901211009 ./dev-ruby/rbpdf-font/rbpdf-font-1.19.1.ebuild
@@ -2259,10 +2238,8 @@
 1901032239 ./dev-ruby/marcel/marcel-0.3.2-r1.ebuild
 1901032239 ./dev-ruby/marcel/marcel-0.3.3-r1.ebuild
 1902022039 ./dev-ruby/dnsruby/dnsruby-1.61.2.ebuild
-1810281009 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.7.ebuild
 1901051309 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
 1708142015 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1.ebuild
-1801101009 ./dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1-r1.ebuild
 1902031409 ./dev-ruby/ascii85/ascii85-1.0.3.ebuild
 1801110909 ./dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
 1805051208 ./dev-ruby/celluloid-extras/celluloid-extras-0.20.5.ebuild
@@ -2298,8 +2275,6 @@
 1804042138 ./dev-ruby/strptime/strptime-0.2.3.ebuild
 1902022039 ./dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
 1806070309 ./dev-ruby/dbf/dbf-3.1.1.ebuild
-1901271109 ./dev-ruby/dbf/dbf-4.1.1.ebuild
-1810170839 ./dev-ruby/dbf/dbf-3.1.3.ebuild
 1902231309 ./dev-ruby/dbf/dbf-4.1.2.ebuild
 1808230809 ./dev-ruby/hiera/hiera-3.4.4.ebuild
 1809191009 ./dev-ruby/hiera/hiera-3.4.5.ebuild
@@ -2309,10 +2284,8 @@
 1812261140 ./dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
 1807071209 ./dev-ruby/ruby-vte/ruby-vte-3.1.1.ebuild
 1902151339 ./dev-ruby/ruby-vte/ruby-vte-3.3.2.ebuild
-1812130839 ./dev-ruby/rouge/rouge-2.2.1.ebuild
 1805051038 ./dev-ruby/rouge/rouge-1.11.1-r2.ebuild
-1707011644 ./dev-ruby/rouge/rouge-1.11.1-r1.ebuild
-1812130839 ./dev-ruby/rouge/rouge-2.2.0.ebuild
+1904102039 ./dev-ruby/rouge/rouge-3.3.0.ebuild
 1812130839 ./dev-ruby/rouge/rouge-3.1.1.ebuild
 1805061008 ./dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.0.ebuild
 1901290109 ./dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
@@ -2334,8 +2307,6 @@
 1902112309 ./dev-ruby/ruby-poppler/ruby-poppler-3.3.2.ebuild
 1807071209 ./dev-ruby/ruby-poppler/ruby-poppler-3.1.1.ebuild
 1812281809 ./dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
-1712091039 ./dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild
-1803081008 ./dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.134.ebuild
 1807010909 ./dev-ruby/aws-sdk-resources/aws-sdk-resources-2.11.79.ebuild
 1901202209 ./dev-ruby/serialport/serialport-1.3.1.ebuild
 1901181239 ./dev-ruby/origin/origin-2.3.1.ebuild
@@ -2356,7 +2327,7 @@
 1803222338 ./dev-ruby/rack-test/rack-test-0.6.3.ebuild
 1804271139 ./dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
 1803222338 ./dev-ruby/rack-test/rack-test-0.7.1.ebuild
-1805080738 ./dev-ruby/rack-test/rack-test-1.0.0.ebuild
+1904102039 ./dev-ruby/rack-test/rack-test-1.0.0.ebuild
 1903301009 ./dev-ruby/rack-test/rack-test-1.1.0.ebuild
 1902021109 ./dev-ruby/instantiator/instantiator-0.0.7.ebuild
 1812281039 ./dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -2364,9 +2335,8 @@
 1903112309 ./dev-ruby/optimist/optimist-3.0.0.ebuild
 1805212239 ./dev-ruby/fuubar/fuubar-2.3.1.ebuild
 1903291239 ./dev-ruby/fuubar/fuubar-2.3.2.ebuild
-1801051639 ./dev-ruby/neovim-ruby-client/neovim-ruby-client-0.5.1.ebuild
 1806120009 ./dev-ruby/neovim-ruby-client/neovim-ruby-client-0.7.1.ebuild
-1803091238 ./dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
+1904112109 ./dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
 1902031409 ./dev-ruby/airbrussh/airbrussh-1.3.1.ebuild
 1807310809 ./dev-ruby/airbrussh/airbrussh-1.3.0.ebuild
 1901271439 ./dev-ruby/rex-java/rex-java-0.1.5.ebuild
@@ -2377,7 +2347,6 @@
 1901161039 ./dev-ruby/tilt/tilt-2.0.9.ebuild
 1710010344 ./dev-ruby/tilt/tilt-2.0.5.ebuild
 1902031409 ./dev-ruby/aws-sigv4/aws-sigv4-1.0.3.ebuild
-1709011014 ./dev-ruby/aws-sigv4/aws-sigv4-1.0.2.ebuild
 1904030909 ./dev-ruby/coolio/coolio-1.5.4.ebuild
 1901121109 ./dev-ruby/coolio/coolio-1.5.3.ebuild
 1902021209 ./dev-ruby/flog/flog-4.6.2.ebuild
@@ -2423,11 +2392,8 @@
 1707170920 ./dev-ruby/dep_selector/dep_selector-1.0.5.ebuild
 1902031409 ./dev-ruby/bogus/bogus-0.1.6.ebuild
 1901202209 ./dev-ruby/sdoc/sdoc-1.0.0.ebuild
-1708020742 ./dev-ruby/bindata/bindata-2.4.0.ebuild
 1901220009 ./dev-ruby/bindata/bindata-2.4.1.ebuild
 1902022039 ./dev-ruby/dust/dust-0.1.7-r2.ebuild
-1803052238 ./dev-ruby/faraday/faraday-0.14.0.ebuild
-1811251339 ./dev-ruby/faraday/faraday-0.15.3.ebuild
 1812091110 ./dev-ruby/faraday/faraday-0.15.4.ebuild
 1901271439 ./dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
 1902021209 ./dev-ruby/filesize/filesize-0.2.0.ebuild
@@ -2456,13 +2422,10 @@
 1901202209 ./dev-ruby/semver2/semver2-3.4.2.ebuild
 1901091139 ./dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
 1801250938 ./dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
-1810240939 ./dev-ruby/rspec-rails/rspec-rails-3.8.1.ebuild
-1808051009 ./dev-ruby/rspec-rails/rspec-rails-3.8.0.ebuild
 1901211009 ./dev-ruby/rspec-rails/rspec-rails-3.8.2.ebuild
 1902031409 ./dev-ruby/cliver/cliver-0.3.2.ebuild
-1901091139 ./dev-ruby/thor/thor-0.20.3.ebuild
+1904112109 ./dev-ruby/thor/thor-0.20.3.ebuild
 1804271139 ./dev-ruby/thor/thor-0.19.4.ebuild
-1805061708 ./dev-ruby/thor/thor-0.20.0.ebuild
 1804141008 ./dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild
 1901202209 ./dev-ruby/ae/ae-1.8.2.ebuild
 1903151009 ./dev-ruby/journey/journey-1.0.4-r1.ebuild
@@ -2515,7 +2478,7 @@
 1801090309 ./dev-ruby/uglifier/uglifier-3.2.0.ebuild
 1707150820 ./dev-ruby/vcr/vcr-2.9.3.ebuild
 1901121139 ./dev-ruby/vcr/vcr-1.11.3.ebuild
-1803252308 ./dev-ruby/vcr/vcr-4.0.0.ebuild
+1904112109 ./dev-ruby/vcr/vcr-4.0.0.ebuild
 1804150838 ./dev-ruby/hashery/hashery-2.1.2.ebuild
 1902021109 ./dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5.ebuild
 1902110909 ./dev-ruby/rinku/rinku-2.0.5.ebuild
@@ -2554,10 +2517,7 @@
 1903080839 ./dev-ruby/curb/curb-0.9.9.ebuild
 1804260738 ./dev-ruby/fakefs/fakefs-0.11.3.ebuild
 1903151009 ./dev-ruby/fakefs/fakefs-0.20.0.ebuild
-1901170839 ./dev-ruby/fakefs/fakefs-0.18.1.ebuild
 1902220939 ./dev-ruby/fakefs/fakefs-0.19.2.ebuild
-1902101439 ./dev-ruby/fakefs/fakefs-0.19.0.ebuild
-1710141919 ./dev-ruby/elasticsearch/elasticsearch-5.0.4.ebuild
 1805271008 ./dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild
 1808010939 ./dev-ruby/elasticsearch/elasticsearch-6.1.0.ebuild
 1806230939 ./dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
@@ -2599,7 +2559,6 @@
 1708250851 ./dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild
 1903301009 ./dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
 1708221219 ./dev-ruby/slop/slop-3.6.0.ebuild
-1705030744 ./dev-ruby/slop/slop-4.4.3.ebuild
 1901201339 ./dev-ruby/slop/slop-4.6.2.ebuild
 1902011209 ./dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
 1807171009 ./dev-ruby/ruby_smb/ruby_smb-1.0.3.ebuild
@@ -2611,16 +2570,11 @@
 1809040909 ./dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
 1901170839 ./dev-ruby/ast/ast-2.4.0.ebuild
 1809040909 ./dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
-1803081008 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.134.ebuild
 1807010909 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.11.79.ebuild
-1712091039 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
 1901161039 ./dev-ruby/timers/timers-4.2.0.ebuild
 1805010839 ./dev-ruby/timers/timers-4.1.2.ebuild
-1901250939 ./dev-ruby/sexp_processor/sexp_processor-4.11.0.ebuild
 1903131009 ./dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
-1802241038 ./dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
 1712212239 ./dev-ruby/sexp_processor/sexp_processor-4.9.0.ebuild
-1802130938 ./dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild
 1804271139 ./dev-ruby/sinatra/sinatra-1.4.8.ebuild
 1811262239 ./dev-ruby/sinatra/sinatra-2.0.3.ebuild
 1903301009 ./dev-ruby/sinatra/sinatra-2.0.5.ebuild
@@ -2637,15 +2591,14 @@
 1901111109 ./dev-ruby/execjs/execjs-2.7.0.ebuild
 1902011509 ./dev-ruby/lockfile/lockfile-2.1.3.ebuild
 1803222338 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
-1903301239 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild
+1904112109 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild
 1812270709 ./dev-ruby/backports/backports-3.8.0.ebuild
 1904070939 ./dev-ruby/backports/backports-3.13.0.ebuild
 1812270609 ./dev-ruby/backports/backports-3.11.4.ebuild
 1904060909 ./dev-ruby/backports/backports-3.12.0.ebuild
 1901111109 ./dev-ruby/erubis/erubis-2.7.0-r2.ebuild
 1901272239 ./dev-ruby/narray/narray-0.6.1.2.ebuild
-1803252308 ./dev-ruby/webrobots/webrobots-0.1.2.ebuild
-1806030838 ./dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
+1904112109 ./dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
 1902102109 ./dev-ruby/slim/slim-3.0.9.ebuild
 1903041009 ./dev-ruby/slim/slim-4.0.1.ebuild
 1901181139 ./dev-ruby/bundler-audit/bundler-audit-0.6.1.ebuild
@@ -2694,12 +2647,8 @@
 1809172239 ./dev-ruby/d3_rails/d3_rails-4.1.1.ebuild
 1802031108 ./dev-ruby/d3_rails/d3_rails-3.5.17.ebuild
 1805191109 ./dev-ruby/sass-rails/sass-rails-5.0.7.ebuild
-1807140839 ./dev-ruby/shoulda-matchers/shoulda-matchers-3.1.2.ebuild
 1807092239 ./dev-ruby/shoulda-matchers/shoulda-matchers-2.8.0-r1.ebuild
 1903291239 ./dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild
-1707170920 ./dev-ruby/bson/bson-4.2.2.ebuild
-1809172239 ./dev-ruby/bson/bson-4.3.0.ebuild
-1901191139 ./dev-ruby/bson/bson-4.4.1.ebuild
 1901311039 ./dev-ruby/bson/bson-4.4.2.ebuild
 1707300857 ./dev-ruby/flexmock/flexmock-2.3.5.ebuild
 1901222139 ./dev-ruby/flexmock/flexmock-2.3.6.ebuild
@@ -2763,9 +2712,7 @@
 1904010909 ./dev-ruby/mime-types-data/mime-types-data-3.2019.0331.ebuild
 1806230939 ./dev-ruby/chunky_png/chunky_png-1.3.10.ebuild
 1812091110 ./dev-ruby/chunky_png/chunky_png-1.3.11.ebuild
-1805150838 ./dev-ruby/rack-cache/rack-cache-1.7.2.ebuild
-1902270939 ./dev-ruby/rack-cache/rack-cache-1.9.0.ebuild
-1803222338 ./dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
+1904112109 ./dev-ruby/rack-cache/rack-cache-1.9.0.ebuild
 1902270939 ./dev-ruby/rack-cache/rack-cache-1.8.0.ebuild
 1901222139 ./dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
 1812300709 ./dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -2773,7 +2720,6 @@
 1708250855 ./dev-ruby/rack-attack/rack-attack-4.4.1.ebuild
 1901272239 ./dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
 1808010939 ./dev-ruby/elasticsearch-transport/elasticsearch-transport-6.1.0.ebuild
-1710141919 ./dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.4.ebuild
 1805271038 ./dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild
 1811151039 ./dev-ruby/httparty/httparty-0.16.3.ebuild
 1808251109 ./dev-ruby/httparty/httparty-0.16.2.ebuild
@@ -2836,8 +2782,8 @@
 1901101309 ./dev-ruby/celluloid/celluloid-0.17.4.ebuild
 1712290209 ./dev-ruby/gpgme/gpgme-2.0.12-r1.ebuild
 1904092009 ./dev-ruby/gpgme/gpgme-2.0.18.ebuild
-1902031409 ./dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
-1710050745 ./dev-ruby/factory_girl/factory_girl-4.8.1.ebuild
+1904112109 ./dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
+1904112139 ./dev-ruby/factory_girl/factory_girl-4.8.1.ebuild
 1809040909 ./dev-ruby/ox/ox-2.10.0.ebuild
 1803201012 ./dev-ruby/ox/ox-2.8.2.ebuild
 1806130709 ./dev-ruby/ox/ox-2.9.3.ebuild
@@ -2902,7 +2848,6 @@
 1809172239 ./dev-ruby/date_validator/date_validator-0.9.0.ebuild
 1803021308 ./dev-ruby/activeldap/activeldap-4.0.6.ebuild
 1902151339 ./dev-ruby/activeldap/activeldap-5.2.3.ebuild
-1807130909 ./dev-ruby/activeldap/activeldap-5.2.2.ebuild
 1901191209 ./dev-ruby/multipart-post/multipart-post-2.0.0-r1.ebuild
 1812011039 ./dev-ruby/arel-helpers/arel-helpers-2.8.0.ebuild
 1901271439 ./dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
@@ -2916,6 +2861,7 @@
 1809181009 ./dev-ruby/facter/facter-9999.ebuild
 1811231239 ./dev-ruby/facter/facter-3.9.2.ebuild
 1903261909 ./dev-ruby/facter/facter-3.13.1.ebuild
+1904112339 ./dev-ruby/facter/facter-3.13.2.ebuild
 1902151939 ./dev-ruby/facter/facter-3.12.3.ebuild
 1901152039 ./dev-ruby/facter/facter-3.12.2.ebuild
 1903232309 ./dev-ruby/facter/facter-3.12.4.ebuild
@@ -2924,6 +2870,7 @@
 1812302139 ./dev-ruby/test-unit/test-unit-3.2.7.ebuild
 1805130808 ./dev-ruby/test-unit/test-unit-3.2.8.ebuild
 1903271009 ./dev-ruby/test-unit/test-unit-3.3.1.ebuild
+1904111009 ./dev-ruby/test-unit/test-unit-3.3.2.ebuild
 1812261140 ./dev-ruby/test-unit/test-unit-3.2.9.ebuild
 1901230939 ./dev-ruby/test-unit/test-unit-3.3.0.ebuild
 1812311009 ./dev-ruby/wirble/wirble-0.1.3-r4.ebuild
@@ -2964,8 +2911,6 @@
 1902011509 ./dev-ruby/kissfft/kissfft-0.0.2.ebuild
 1712212239 ./dev-ruby/ruby2ruby/ruby2ruby-2.3.2.ebuild
 1903131009 ./dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
-1901262009 ./dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
-1707180754 ./dev-ruby/ruby2ruby/ruby2ruby-2.4.0.ebuild
 1901201339 ./dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
 1902101039 ./dev-ruby/minitar/minitar-0.8.ebuild
 1901201339 ./dev-ruby/simple-rss/simple-rss-1.3.3.ebuild
@@ -2980,8 +2925,6 @@
 1803280108 ./dev-ruby/cmdparse/cmdparse-2.0.6-r1.ebuild
 1812241009 ./dev-ruby/cmdparse/cmdparse-3.0.4.ebuild
 1802022008 ./dev-ruby/cmdparse/cmdparse-3.0.3.ebuild
-1803081008 ./dev-ruby/aws-sdk/aws-sdk-2.10.134.ebuild
-1712091039 ./dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild
 1807010909 ./dev-ruby/aws-sdk/aws-sdk-2.11.79.ebuild
 1801090309 ./dev-ruby/path_expander/path_expander-1.0.2.ebuild
 1901290109 ./dev-ruby/path_expander/path_expander-1.0.3.ebuild
@@ -3061,7 +3004,6 @@
 1807071209 ./dev-ruby/httpclient/httpclient-2.8.3.ebuild
 1903151039 ./dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r1.ebuild
 1901191209 ./dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
-1804192308 ./dev-ruby/barby/barby-0.6.5.ebuild
 1812131139 ./dev-ruby/barby/barby-0.6.6.ebuild
 1901201009 ./dev-ruby/colored/colored-1.2.ebuild
 1811231409 ./dev-ruby/webmock/webmock-3.4.1.ebuild
@@ -3095,7 +3037,7 @@
 1812131139 ./dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
 1902031409 ./dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
 1807221809 ./dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
-1712290209 ./dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
+1904111009 ./dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6-r1.ebuild
 1805201109 ./dev-ruby/rdoc/rdoc-6.0.4.ebuild
 1812300709 ./dev-ruby/rdoc/rdoc-5.1.0.ebuild
 1812281039 ./dev-ruby/rdoc/rdoc-6.1.1.ebuild
@@ -3114,9 +3056,7 @@
 1901212309 ./dev-ruby/logue/logue-1.0.13-r1.ebuild
 1901220939 ./dev-ruby/logue/logue-1.0.16.ebuild
 1807310809 ./dev-ruby/capistrano/capistrano-3.11.0.ebuild
-1804170739 ./dev-ruby/capistrano/capistrano-3.10.2.ebuild
 1902031409 ./dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
-1803031138 ./dev-ruby/capistrano/capistrano-3.10.1.ebuild
 1802201008 ./dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
 1901191209 ./dev-ruby/ttfunk/ttfunk-1.5.1.ebuild
 1803052038 ./dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
@@ -3125,7 +3065,6 @@
 1904071139 ./dev-ruby/zeitwerk/zeitwerk-1.4.3.ebuild
 1903202009 ./dev-ruby/bcat/bcat-0.6.2-r3.ebuild
 1901091139 ./dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
-1804280938 ./dev-ruby/rb-inotify/rb-inotify-0.9.10-r1.ebuild
 1807102239 ./dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
 1901271439 ./dev-ruby/rex-sslscan/rex-sslscan-0.1.5.ebuild
 1901272239 ./dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
@@ -3141,6 +3080,7 @@
 1803252308 ./dev-ruby/rails-dom-testing/rails-dom-testing-1.0.8-r1.ebuild
 1903301239 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
 1901271839 ./dev-ruby/rex-powershell/rex-powershell-0.1.78.ebuild
+1904111009 ./dev-ruby/rex-powershell/rex-powershell-0.1.80.ebuild
 1901271839 ./dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
 1901271439 ./dev-ruby/rex-powershell/rex-powershell-0.1.79.ebuild
 1807071209 ./dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.1.1.ebuild
@@ -3184,8 +3124,8 @@
 1901191109 ./dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
 1807030839 ./dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
 1812121809 ./dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
-1801212308 ./dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
-1807152139 ./dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
+1904102039 ./dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
+1904102039 ./dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
 1901142009 ./dev-ruby/plist/plist-3.4.0.ebuild
 1809150739 ./dev-ruby/html2haml/html2haml-2.2.0.ebuild
 1902112339 ./dev-ruby/ruby-gdk3/ruby-gdk3-3.3.2.ebuild
@@ -3195,7 +3135,6 @@
 1901191209 ./dev-ruby/simple_oauth/simple_oauth-0.3.1.ebuild
 1902171039 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.2.ebuild
 1807071209 ./dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.1.1.ebuild
-1710141919 ./dev-ruby/elasticsearch-api/elasticsearch-api-5.0.4.ebuild
 1808010939 ./dev-ruby/elasticsearch-api/elasticsearch-api-6.1.0.ebuild
 1805271008 ./dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild
 1812121809 ./dev-ruby/prawn-table/prawn-table-0.2.2-r1.ebuild
@@ -3487,12 +3426,13 @@
 1802171739 ./www-client/uget/uget-9999.ebuild
 1902172109 ./www-client/netsurf/netsurf-3.8-r2.ebuild
 1902061639 ./www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
+1904111909 ./www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
 1902061639 ./www-client/w3mmee/w3mmee-0.3.2_p24-r11.ebuild
 1812272209 ./www-client/w3m/w3m-0.5.3_p20180125.ebuild
 1902251639 ./www-client/w3m/w3m-0.5.3_p20190105.ebuild
 1709021145 ./www-client/luakit/luakit-9999.ebuild
 1709021145 ./www-client/luakit/luakit-2017.08.10.ebuild
-1903210309 ./www-client/google-chrome/google-chrome-73.0.3683.86.ebuild
+1904110439 ./www-client/google-chrome/google-chrome-73.0.3683.103.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
 1902192109 ./www-client/falkon/falkon-3.0.1-r1.ebuild
 1903201539 ./www-client/falkon/falkon-3.1.0.ebuild
@@ -3500,7 +3440,7 @@
 1903311309 ./www-client/opera/opera-58.0.3135.127.ebuild
 1807261839 ./www-client/opera/opera-12.16_p1860-r1.ebuild
 1904071809 ./www-client/midori/midori-7.0.ebuild
-1903301639 ./www-client/google-chrome-beta/google-chrome-beta-74.0.3729.40.ebuild
+1904110439 ./www-client/google-chrome-beta/google-chrome-beta-74.0.3729.75.ebuild
 1802051308 ./www-client/phantomjs/phantomjs-2.1.1-r1.ebuild
 1709191820 ./www-client/phantomjs/phantomjs-2.1.1.ebuild
 1810211239 ./www-client/pybugz/pybugz-9999.ebuild
@@ -3521,9 +3461,9 @@
 1904092339 ./www-client/vivaldi-snapshot/vivaldi-snapshot-2.5.1511.4_p1.ebuild
 1904031909 ./www-client/opera-beta/opera-beta-60.0.3255.20.ebuild
 1903281739 ./www-client/opera-beta/opera-beta-60.0.3255.15.ebuild
-1904052239 ./www-client/firefox/firefox-60.6.1.ebuild
-1903281339 ./www-client/firefox/firefox-66.0.2.ebuild
+1904120009 ./www-client/firefox/firefox-60.6.1.ebuild
 1809081639 ./www-client/firefox/firefox-52.9.0.ebuild
+1904102039 ./www-client/firefox/firefox-66.0.3.ebuild
 1710062321 ./www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild
 1708081533 ./www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild
 1904090939 ./www-client/opera-developer/opera-developer-61.0.3282.0.ebuild
@@ -3540,7 +3480,7 @@
 1903162209 ./www-client/lynx/lynx-2.8.9_pre16.ebuild
 1812131039 ./www-client/lynx/lynx-2.8.9_p1.ebuild
 1808091839 ./www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
-1903301639 ./www-client/google-chrome-unstable/google-chrome-unstable-75.0.3745.4.ebuild
+1904110439 ./www-client/google-chrome-unstable/google-chrome-unstable-75.0.3759.4.ebuild
 1805012209 ./www-client/ck4up/ck4up-1.2.ebuild
 1903180209 ./www-client/chromium/chromium-73.0.3683.75.ebuild
 1903220509 ./www-client/chromium/chromium-73.0.3683.86.ebuild
@@ -3977,8 +3917,8 @@
 1801231609 ./sys-devel/binutils/binutils-2.28.1.ebuild
 1902231639 ./sys-devel/binutils/binutils-2.32.ebuild
 1812221509 ./sys-devel/binutils/binutils-2.30-r4.ebuild
-1902231617 ./sys-devel/binutils/binutils-9999.ebuild
-1904080539 ./sys-devel/binutils/binutils-2.31.1-r4.ebuild
+1904111439 ./sys-devel/binutils/binutils-9999.ebuild
+1904110239 ./sys-devel/binutils/binutils-2.31.1-r4.ebuild
 1801231609 ./sys-devel/binutils/binutils-2.26.1.ebuild
 1801231609 ./sys-devel/binutils/binutils-2.25.1-r1.ebuild
 1801231609 ./sys-devel/binutils/binutils-2.27-r1.ebuild
@@ -4099,15 +4039,11 @@
 1805181939 ./sys-devel/gnuconfig/gnuconfig-20170101.ebuild
 1805181939 ./sys-devel/gnuconfig/gnuconfig-20180101.ebuild
 1805181939 ./sys-devel/gnuconfig/gnuconfig-99999999.ebuild
-1808310639 ./sys-devel/patch/patch-2.7.6-r2.ebuild
-1904081209 ./sys-devel/patch/patch-2.7.6-r3.ebuild
+1904111309 ./sys-devel/patch/patch-2.7.6-r3.ebuild
 1812272209 ./sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
 1901072109 ./sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
 1904081009 ./sys-devel/distcc/distcc-3.3.2-r5.ebuild
-1902121609 ./sys-devel/distcc/distcc-3.3.ebuild
 1812082109 ./sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
-1903170209 ./sys-devel/distcc/distcc-3.3.2-r4.ebuild
-1902121609 ./sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
 1702282250 ./sys-devel/pmake/pmake-1.111.3.1.ebuild
 1706211326 ./sys-devel/pmake/pmake-1.111.3.3.ebuild
 1807241309 ./sys-devel/clang-common/clang-common-6.0.1.ebuild
@@ -4323,6 +4259,7 @@
 1812161409 ./app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
 1809221409 ./app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
 1902162209 ./app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+1904102209 ./app-crypt/signing-party/signing-party-2.9.ebuild
 1809280333 ./app-crypt/signing-party/signing-party-2.7.ebuild
 1811281739 ./app-crypt/rainbowcrack/rainbowcrack-1.7.ebuild
 1702282250 ./app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
@@ -4567,7 +4504,7 @@
 1810191409 ./virtual/jdk/jdk-11.ebuild
 1702282250 ./virtual/jdk/jdk-1.8.0-r3.ebuild
 1902011239 ./virtual/jdk/jdk-1.8.0-r4.ebuild
-1808310240 ./virtual/jpeg/jpeg-0-r2.ebuild
+1904112039 ./virtual/jpeg/jpeg-0-r3.ebuild
 1808310240 ./virtual/jpeg/jpeg-62.ebuild
 1903111339 ./virtual/notification-daemon/notification-daemon-0.ebuild
 1801231609 ./virtual/libc/libc-0.ebuild
@@ -4774,7 +4711,7 @@
 1705261151 ./virtual/ffmpeg/ffmpeg-9-r2.ebuild
 1902161209 ./virtual/perl-Archive-Tar/perl-Archive-Tar-2.240.0.ebuild
 1808310240 ./virtual/perl-Archive-Tar/perl-Archive-Tar-2.40.100_rc-r6.ebuild
-1904082209 ./virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
+1904110109 ./virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
 1807101039 ./virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0.ebuild
 1803201012 ./virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.990.0-r2.ebuild
 1703291854 ./virtual/modutils/modutils-0.ebuild
@@ -5055,8 +4992,6 @@
 1711130008 ./sys-auth/munge/munge-0.5.10-r2.ebuild
 1901021609 ./sys-auth/munge/munge-0.5.13-r1.ebuild
 1703161012 ./sys-auth/pam_mount/pam_mount-2.16.ebuild
-1702282250 ./sys-auth/pam_mount/pam_mount-2.15.ebuild
-1702282250 ./sys-auth/pam_mount/pam_mount-2.14.ebuild
 1804020938 ./sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
 1706131810 ./sys-auth/consolekit/consolekit-9999.ebuild
 1702282250 ./sys-auth/consolekit/consolekit-0.4.6.ebuild
@@ -5091,9 +5026,10 @@
 1702282250 ./sys-auth/ykclient/ykclient-2.15.ebuild
 1702282250 ./sys-auth/ykclient/ykclient-2.14.ebuild
 1808060339 ./sys-auth/sakcl/sakcl-0.1.0.ebuild
-1904091039 ./sys-auth/keystone/keystone-2019.1.9999.ebuild
+1904110039 ./sys-auth/keystone/keystone-2019.1.9999.ebuild
 1808302039 ./sys-auth/keystone/keystone-2018.2.9999.ebuild
 1811302009 ./sys-auth/keystone/keystone-14.0.1.ebuild
+1904110039 ./sys-auth/keystone/keystone-15.0.0.ebuild
 1904050539 ./sys-auth/keystone/keystone-14.1.0.ebuild
 1708271127 ./sys-auth/pam_abl/pam_abl-0.6.0.ebuild
 1801032209 ./sys-auth/pam_fprint/pam_fprint-0.2-r1.ebuild
@@ -5367,7 +5303,7 @@
 1703261630 ./net-libs/adns/adns-1.4-r2.ebuild
 1805012209 ./net-libs/adns/adns-1.4.ebuild
 1903262309 ./net-libs/gnutls/gnutls-3.6.6.ebuild
-1904080039 ./net-libs/gnutls/gnutls-3.6.7.ebuild
+1904110109 ./net-libs/gnutls/gnutls-3.6.7.ebuild
 1901070339 ./net-libs/gnutls/gnutls-3.5.19.ebuild
 1901152209 ./net-libs/gnutls/gnutls-3.6.5.ebuild
 1901081009 ./net-libs/gnutls/gnutls-3.5.19-r1.ebuild
@@ -5407,6 +5343,7 @@
 1903030009 ./net-libs/libasyncns/libasyncns-0.8-r4.ebuild
 1812121739 ./net-libs/jreen/jreen-1.3.0-r1.ebuild
 1812281409 ./net-libs/http-parser/http-parser-99999.ebuild
+1904110939 ./net-libs/http-parser/http-parser-2.9.1.ebuild
 1812291409 ./net-libs/http-parser/http-parser-2.9.0-r1.ebuild
 1812121609 ./net-libs/http-parser/http-parser-2.8.1.ebuild
 1702282250 ./net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -5490,8 +5427,8 @@
 1707292335 ./net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
 1805091839 ./net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
 1803211138 ./net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
-1809050009 ./net-libs/libiio/libiio-9999.ebuild
-1809050009 ./net-libs/libiio/libiio-0.15-r1.ebuild
+1904111909 ./net-libs/libiio/libiio-9999.ebuild
+1904111909 ./net-libs/libiio/libiio-0.15-r1.ebuild
 1704100150 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 1702282250 ./net-libs/libupnp/libupnp-1.6.21.ebuild
 1810252139 ./net-libs/libupnp/libupnp-1.8.4.ebuild
@@ -5563,9 +5500,7 @@
 1809241839 ./net-libs/nativebiginteger/nativebiginteger-0.9.36.ebuild
 1810212109 ./net-libs/nativebiginteger/nativebiginteger-0.9.36-r1.ebuild
 1802261738 ./net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
-1901031409 ./net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
 1904082239 ./net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
-1904050839 ./net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
 1904012039 ./net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
 1805012209 ./net-libs/roadrunner/roadrunner-0.9.1.ebuild
 1903311109 ./net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
@@ -5574,7 +5509,6 @@
 1805300338 ./net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
 1810131309 ./net-libs/libbloom/libbloom-1.5-r1.ebuild
 1904100039 ./net-libs/gupnp-av/gupnp-av-0.12.11.ebuild
-1702282250 ./net-libs/gupnp-av/gupnp-av-0.12.10.ebuild
 1702282250 ./net-libs/dslib/dslib-3.0-r1.ebuild
 1702282250 ./net-libs/libhackrf/libhackrf-9999.ebuild
 1803300139 ./net-libs/libhackrf/libhackrf-2018.01.1.ebuild
@@ -5598,7 +5532,7 @@
 1808151339 ./games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild
 1711182327 ./games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
 1812191739 ./games-action/intrusion2/intrusion2-1.024.ebuild
-1808151339 ./games-action/lugaru/lugaru-20151204-r1.ebuild
+1904112039 ./games-action/lugaru/lugaru-20151204-r1.ebuild
 1807170139 ./games-action/garden/garden-1.0.9-r1.ebuild
 1808151339 ./games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
 1812202039 ./games-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild
@@ -5624,10 +5558,10 @@
 1812202039 ./games-action/beathazardultra/beathazardultra-20130308-r1.ebuild
 1812202039 ./games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
 1803251938 ./games-action/trine/trine-1.08-r3.ebuild
-1904100309 ./games-action/minetest/minetest-5.0.1.ebuild
 1805212239 ./games-action/minetest/minetest-0.4.16-r1.ebuild
 1806172339 ./games-action/minetest/minetest-0.4.17-r1.ebuild
 1806211009 ./games-action/minetest/minetest-0.4.17.1.ebuild
+1904110139 ./games-action/minetest/minetest-5.0.1-r1.ebuild
 1707090132 ./games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
 1711182327 ./games-action/heretic2/heretic2-1.06c-r1.ebuild
 1808151339 ./games-action/powermanga/powermanga-0.93.1-r1.ebuild
@@ -5970,6 +5904,7 @@
 1903090409 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.13.ebuild
 1812230739 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild
 1812230739 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+1904101809 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.14.ebuild
 1707301512 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild
 1901162309 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild
 1707301512 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild
@@ -7217,6 +7152,7 @@
 1804120208 ./dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild
 1902120939 ./dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
 1804120208 ./dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
+1904111909 ./dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
 1711260010 ./dev-libs/cityhash/cityhash-1.0.3.ebuild
 1711260010 ./dev-libs/cityhash/cityhash-1.1.1.ebuild
 1711260010 ./dev-libs/cityhash/cityhash-1.1.0.ebuild
@@ -7329,7 +7265,6 @@
 1810291209 ./dev-libs/libksba/libksba-1.3.5-r2.ebuild
 1808310239 ./dev-libs/libksba/libksba-1.3.5-r1.ebuild
 1901010039 ./dev-libs/handystats/handystats-1.11.3.ebuild
-1811041139 ./dev-libs/libgit2-glib/libgit2-glib-0.27.7.ebuild
 1810031209 ./dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
 1810261209 ./dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
 1902151539 ./dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild
@@ -7390,7 +7325,7 @@
 1903172339 ./dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
 1702282250 ./dev-libs/libf2c/libf2c-20110801-r4.ebuild
 1702282250 ./dev-libs/libf2c/libf2c-20130927.ebuild
-1812012209 ./dev-libs/libowfat/libowfat-0.32-r1.ebuild
+1904110109 ./dev-libs/libowfat/libowfat-0.32-r1.ebuild
 1812040109 ./dev-libs/libowfat/libowfat-0.31-r1.ebuild
 1708271013 ./dev-libs/liboobs/liboobs-3.0.0.ebuild
 1808310239 ./dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -7631,10 +7566,9 @@
 1712031839 ./dev-libs/icu/icu-58.2-r1.ebuild
 1901231709 ./dev-libs/icu/icu-63.1-r1.ebuild
 1904100039 ./dev-libs/folks/folks-0.11.4-r1.ebuild
-1902231709 ./dev-libs/folks/folks-0.11.4.ebuild
 1901291639 ./dev-libs/libgit2/libgit2-0.27.8.ebuild
 1810290209 ./dev-libs/libgit2/libgit2-0.26.8.ebuild
-1808070939 ./dev-libs/libgit2/libgit2-9999.ebuild
+1904101839 ./dev-libs/libgit2/libgit2-9999.ebuild
 1902151539 ./dev-libs/libgit2/libgit2-0.28.1.ebuild
 1712270109 ./dev-libs/liblist/liblist-2.4.ebuild
 1702282250 ./dev-libs/libb64/libb64-1.2.1.ebuild
@@ -7695,7 +7629,7 @@
 1902232039 ./dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
 1902232039 ./dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
 1902232009 ./dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
-1903151709 ./dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
+1904112209 ./dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
 1812272039 ./dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
 1902232039 ./dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
 1902232039 ./dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
@@ -7748,8 +7682,6 @@
 1904020509 ./dev-libs/libp11/libp11-0.4.9.ebuild
 1810261309 ./dev-libs/hiredis/hiredis-0.14.0.ebuild
 1806081509 ./dev-libs/hiredis/hiredis-0.13.3.ebuild
-1903101909 ./dev-libs/libmirage/libmirage-3.2.0.ebuild
-1903101909 ./dev-libs/libmirage/libmirage-3.2.1.ebuild
 1904100009 ./dev-libs/libmirage/libmirage-3.2.2.ebuild
 1708141636 ./dev-libs/userspace-rcu/userspace-rcu-0.10.0.ebuild
 1811231309 ./dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
@@ -7874,7 +7806,7 @@
 1805012209 ./dev-libs/cvector/cvector-1.0.3-r1.ebuild
 1901030109 ./dev-libs/stb/stb-20180211.ebuild
 1901291539 ./dev-libs/vala-common/vala-common-0.36.15.ebuild
-1904080009 ./dev-libs/vala-common/vala-common-0.40.14.ebuild
+1904110109 ./dev-libs/vala-common/vala-common-0.40.14.ebuild
 1903040009 ./dev-libs/vala-common/vala-common-0.42.6.ebuild
 1902172009 ./dev-libs/gom/gom-0.3.2-r1.ebuild
 1812071939 ./dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
@@ -8057,7 +7989,7 @@
 1902172109 ./dev-libs/utfcpp/utfcpp-2.3.4.ebuild
 1808310239 ./dev-libs/elfutils/elfutils-0.173.ebuild
 1808310239 ./dev-libs/elfutils/elfutils-0.170-r1.ebuild
-1904100839 ./dev-libs/elfutils/elfutils-0.173-r1.ebuild
+1904112239 ./dev-libs/elfutils/elfutils-0.173-r1.ebuild
 1902030309 ./dev-libs/elfutils/elfutils-0.175-r1.ebuild
 1904091009 ./dev-libs/elfutils/elfutils-0.176.ebuild
 1810121709 ./dev-libs/libwacom/libwacom-0.30.ebuild
@@ -8499,9 +8431,9 @@
 1808310240 ./x11-terms/sakura/sakura-3.5.0.ebuild
 1811041539 ./x11-terms/sakura/sakura-3.6.0-r1.ebuild
 1805220439 ./x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
-1805220439 ./x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
+1904101709 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22-r2.ebuild
+1904101709 ./x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
 1904080109 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
-1805220439 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
 1805220439 ./x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
 1810071309 ./x11-terms/guake/guake-3.4.0-r1.ebuild
 1902042339 ./x11-terms/guake/guake-3.3.2.ebuild
@@ -8978,7 +8910,7 @@
 1710071425 ./app-arch/zoo/zoo-2.10-r5.ebuild
 1702282250 ./app-arch/sharutils/sharutils-4.14-r1.ebuild
 1702282250 ./app-arch/sharutils/sharutils-4.15.1.ebuild
-1904080909 ./app-arch/sharutils/sharutils-4.15.2-r1.ebuild
+1904101809 ./app-arch/sharutils/sharutils-4.15.2-r1.ebuild
 1808310239 ./app-arch/zip/zip-3.0-r3.ebuild
 1707141045 ./app-arch/fastjar/fastjar-0.98-r3.ebuild
 1707141045 ./app-arch/fastjar/fastjar-0.98-r2.ebuild
@@ -9075,7 +9007,6 @@
 1812182009 ./app-arch/stuffit/stuffit-5.2.0.611.ebuild
 1702282250 ./app-arch/duff/duff-0.5.2.ebuild
 1804222238 ./app-arch/unadf/unadf-0.7.12-r1.ebuild
-1807232209 ./app-arch/lzip/lzip-1.20.ebuild
 1904081009 ./app-arch/lzip/lzip-1.21.ebuild
 1706301419 ./app-arch/lzlib/lzlib-1.9.ebuild
 1904081009 ./app-arch/tar/tar-1.32.ebuild
@@ -9109,7 +9040,7 @@
 1901052039 ./app-arch/zstd/zstd-1.3.3.ebuild
 1901052039 ./app-arch/zstd/zstd-1.3.2.ebuild
 1901052039 ./app-arch/zstd/zstd-1.3.8.ebuild
-1904082139 ./app-arch/zstd/zstd-1.3.7-r1.ebuild
+1904110109 ./app-arch/zstd/zstd-1.3.7-r1.ebuild
 1901052039 ./app-arch/zstd/zstd-1.3.4-r1.ebuild
 1711071623 ./app-arch/xdms/xdms-1.3.2-r1.ebuild
 1901012239 ./app-arch/xar/xar-1.8-r2.ebuild
@@ -9255,6 +9186,7 @@
 1805202309 ./dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
 1902251809 ./dev-db/pgtap/pgtap-0.99.0.ebuild
 1902161509 ./dev-db/pgadmin4/pgadmin4-4.2-r1.ebuild
+1904111309 ./dev-db/pgadmin4/pgadmin4-4.5.ebuild
 1904081739 ./dev-db/pgadmin4/pgadmin4-4.3.ebuild
 1807092209 ./dev-db/pgadmin4/pgadmin4-3.0.ebuild
 1901210339 ./dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -9271,7 +9203,7 @@
 1902081109 ./dev-db/pgpool2/pgpool2-3.7.7.ebuild
 1904081909 ./dev-db/pgpool2/pgpool2-4.0.3.ebuild
 1807151509 ./dev-db/lmdb/lmdb-0.9.18.ebuild
-1903170209 ./dev-db/lmdb/lmdb-0.9.23.ebuild
+1904110239 ./dev-db/lmdb/lmdb-0.9.23.ebuild
 1806121639 ./dev-db/lmdb/lmdb-0.9.21-r1.ebuild
 1803280438 ./dev-db/lmdb/lmdb-0.9.19.ebuild
 1901081709 ./dev-db/lmdb/lmdb-0.9.22.ebuild
@@ -9586,6 +9518,7 @@
 1803260409 ./sys-kernel/bliss-initramfs/bliss-initramfs-7.1.3.ebuild
 1902231439 ./sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
 1903140209 ./sys-kernel/linux-firmware/linux-firmware-20190313.ebuild
+1904111309 ./sys-kernel/linux-firmware/linux-firmware-20190409.ebuild
 1809021539 ./sys-kernel/cryptodev/cryptodev-9999.ebuild
 1809021539 ./sys-kernel/cryptodev/cryptodev-1.9.ebuild
 1803241538 ./sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.6-r1.ebuild
@@ -9858,7 +9791,7 @@
 1902030039 ./media-gfx/librecad/librecad-2.1.3-r4.ebuild
 1904082009 ./media-gfx/openclipart/openclipart-0.20.ebuild
 1902171609 ./media-gfx/maim/maim-9999.ebuild
-1805252039 ./media-gfx/maim/maim-5.5.1.ebuild
+1904111409 ./media-gfx/maim/maim-5.5.1.ebuild
 1702282250 ./media-gfx/xzgv/xzgv-0.9.1.ebuild
 1902201639 ./media-gfx/digikam/digikam-6.0.0.ebuild
 1903230139 ./media-gfx/simple-scan/simple-scan-3.30.2.ebuild
@@ -9944,6 +9877,7 @@
 1902250139 ./media-gfx/gscan2pdf/gscan2pdf-2.4.0.ebuild
 1902221309 ./media-gfx/fbgrab/fbgrab-1.3.ebuild
 1901301639 ./media-gfx/dcraw/dcraw-9.28.0.ebuild
+1904111739 ./media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
 1702282250 ./media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
 1902160239 ./media-gfx/qiv/qiv-2.3.2.ebuild
 1805010009 ./media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -9964,7 +9898,6 @@
 1812291509 ./media-gfx/libimagequant/libimagequant-2.11.7.ebuild
 1903170109 ./media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
 1904100039 ./media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
-1901160639 ./media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
 1901162309 ./media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
 1901181909 ./media-gfx/inkscape/inkscape-0.92.4.ebuild
 1709261623 ./media-gfx/evoluspencil/evoluspencil-2.0.5.ebuild
@@ -10372,6 +10305,7 @@
 1711182327 ./games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
 1707090132 ./games-board/gnubg/gnubg-1.05.000-r1.ebuild
 1702282250 ./games-board/grhino/grhino-0.16.1-r1.ebuild
+1904111909 ./games-board/grhino/grhino-0.16.1-r2.ebuild
 1705020042 ./games-board/gnome-mines/gnome-mines-3.20.1.ebuild
 1903142209 ./games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
 1902171539 ./games-board/gnome-mines/gnome-mines-3.30.0.ebuild
@@ -10413,7 +10347,7 @@
 1812270139 ./dev-vcs/hub/hub-2.6.1.ebuild
 1702282250 ./dev-vcs/hub/hub-2.2.9.ebuild
 1902280339 ./dev-vcs/hub/hub-2.7.1.ebuild
-1708282143 ./dev-vcs/git-num/git-num-2.0.1.ebuild
+1904111839 ./dev-vcs/git-num/git-num-2.0.1.ebuild
 1902161239 ./dev-vcs/hgsubversion/hgsubversion-1.9.2.ebuild
 1803012238 ./dev-vcs/bfg/bfg-1.13.0.ebuild
 1708311857 ./dev-vcs/bfg/bfg-1.12.15.ebuild
@@ -10437,7 +10371,7 @@
 1904051639 ./dev-vcs/git/git-2.19.2.ebuild
 1904051639 ./dev-vcs/git/git-9999-r2.ebuild
 1904051639 ./dev-vcs/git/git-9999-r3.ebuild
-1904091709 ./dev-vcs/git/git-2.21.0.ebuild
+1904112239 ./dev-vcs/git/git-2.21.0.ebuild
 1904051639 ./dev-vcs/git/git-2.21.0-r1.ebuild
 1904091709 ./dev-vcs/git/git-2.20.1.ebuild
 1904051639 ./dev-vcs/git/git-9999-r1.ebuild
@@ -10607,11 +10541,8 @@
 1809300339 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.26.5.ebuild
 1903181309 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.30.2.ebuild
 1708261307 ./gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
-1902121839 ./gnome-extra/nemo/nemo-3.8.6.ebuild
-1902121839 ./gnome-extra/nemo/nemo-3.8.5-r1.ebuild
-1902152239 ./gnome-extra/nemo/nemo-4.0.6.ebuild
-1902121839 ./gnome-extra/nemo/nemo-4.0.2.ebuild
-1902121839 ./gnome-extra/nemo/nemo-3.6.4.ebuild
+1904101539 ./gnome-extra/nemo/nemo-4.0.6.ebuild
+1904101539 ./gnome-extra/nemo/nemo-3.8.6-r1.ebuild
 1904100039 ./gnome-extra/nemo/nemo-3.6.4-r1.ebuild
 1903151639 ./gnome-extra/zenity/zenity-3.30.0.ebuild
 1812021739 ./gnome-extra/zenity/zenity-3.28.1.ebuild
@@ -10621,11 +10552,10 @@
 1811282309 ./gnome-extra/cjs/cjs-4.0.0.ebuild
 1809091639 ./gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
 1809300339 ./gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
-1901231439 ./gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
 1903080039 ./gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
 1904100039 ./gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
-1810070209 ./gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
-1901302139 ./gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
+1904111709 ./gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+1904111709 ./gnome-extra/gtkhtml/gtkhtml-4.10.0-r1.ebuild
 1702282250 ./gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
 1804270138 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
 1903091439 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-20.ebuild
@@ -10684,7 +10614,6 @@
 1903181309 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.30.1.ebuild
 1903181309 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
 1903172009 ./gnome-extra/gnome-documents/gnome-documents-3.30.1.ebuild
-1903171739 ./gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
 1904100039 ./gnome-extra/gnome-documents/gnome-documents-3.26.3.ebuild
 1804291938 ./gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
 1804122238 ./gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
@@ -10711,14 +10640,13 @@
 1805120339 ./gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
 1811181309 ./gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
 1812062139 ./gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
-1812112139 ./gnome-base/nautilus/nautilus-3.24.2.1-r2.ebuild
 1904100039 ./gnome-base/nautilus/nautilus-3.26.4-r2.ebuild
 1903181309 ./gnome-base/nautilus/nautilus-3.30.5.ebuild
 1903120109 ./gnome-base/nautilus/nautilus-3.28.1.ebuild
 1808310239 ./gnome-base/libglade/libglade-2.6.4-r2.ebuild
 1808310239 ./gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
 1902231309 ./gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild
-1902171909 ./gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
+1904110509 ./gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
 1805120339 ./gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
 1903041409 ./gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
 1903231239 ./gnome-base/gnome-control-center/gnome-control-center-3.30.3-r1.ebuild
@@ -10747,6 +10675,7 @@
 1811181309 ./gnome-base/gnome-light/gnome-light-3.24.2.ebuild
 1810070209 ./gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
 1702282250 ./gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+1904101409 ./gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild
 1903310139 ./gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild
 1903171739 ./gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
 1903171739 ./gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
@@ -10823,7 +10752,7 @@
 1702282250 ./mail-filter/spamass-milter/spamass-milter-0.3.2.ebuild
 1803082308 ./mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
 1712221409 ./mail-filter/opendmarc/opendmarc-1.1.3.ebuild
-1903161839 ./mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+1904112239 ./mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
 1805292338 ./mail-filter/couriersrs/couriersrs-0.1.2.ebuild
 1904062009 ./mail-filter/procmail/procmail-3.22-r14.ebuild
 1901072239 ./mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
@@ -11054,6 +10983,7 @@
 1809281609 ./app-doc/votca-csg-manual/votca-csg-manual-9999.ebuild
 1902161109 ./app-doc/xmltoman/xmltoman-0.4-r1.ebuild
 1805012209 ./app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
+1904101439 ./app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
 1901091639 ./app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
 1810070109 ./app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
 1811101509 ./app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
@@ -11080,6 +11010,7 @@
 1807101539 ./xfce-base/thunar/thunar-1.6.14.ebuild
 1901280639 ./xfce-base/thunar/thunar-1.8.4.ebuild
 1904080039 ./xfce-base/thunar/thunar-1.6.16.ebuild
+1904101139 ./xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
 1809031839 ./xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild
 1812021439 ./xfce-base/xfwm4/xfwm4-4.12.5.ebuild
 1803232309 ./xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild
@@ -11126,7 +11057,7 @@
 1806032138 ./app-editors/vim-core/vim-core-8.0.1298.ebuild
 1804120908 ./app-editors/vim-core/vim-core-8.0.1699.ebuild
 1812290139 ./app-editors/vim-core/vim-core-9999.ebuild
-1904082109 ./app-editors/vim-core/vim-core-8.1.0648.ebuild
+1904110109 ./app-editors/vim-core/vim-core-8.1.0648.ebuild
 1809200839 ./app-editors/vim-core/vim-core-8.1.0412.ebuild
 1903140239 ./app-editors/gedit/gedit-3.30.2.ebuild
 1904060809 ./app-editors/gedit/gedit-3.32.0-r1.ebuild
@@ -11199,7 +11130,7 @@
 1808261139 ./app-editors/gvim/gvim-8.0.1699-r1.ebuild
 1808261139 ./app-editors/gvim/gvim-8.0.1298.ebuild
 1812290139 ./app-editors/gvim/gvim-8.1.0648.ebuild
-1904082239 ./app-editors/gvim/gvim-8.1.0648-r1.ebuild
+1904112239 ./app-editors/gvim/gvim-8.1.0648-r1.ebuild
 1903071639 ./app-editors/qxmledit/qxmledit-0.9.10.ebuild
 1903071639 ./app-editors/qxmledit/qxmledit-0.9.12.ebuild
 1804270508 ./app-editors/elvis/elvis-2.2.0-r6.ebuild
@@ -11249,13 +11180,13 @@
 1807081409 ./app-editors/joe/joe-4.6.ebuild
 1810201509 ./app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
 1808261139 ./app-editors/vim/vim-8.1.0034.ebuild
-1904091539 ./app-editors/vim/vim-8.1.0648-r1.ebuild
+1904112239 ./app-editors/vim/vim-8.1.0648-r1.ebuild
 1808261139 ./app-editors/vim/vim-8.0.1699.ebuild
 1812290139 ./app-editors/vim/vim-8.1.0648.ebuild
 1809200839 ./app-editors/vim/vim-8.1.0412.ebuild
 1808261139 ./app-editors/vim/vim-8.0.1298.ebuild
 1811292309 ./app-editors/vim/vim-8.1.0412-r1.ebuild
-1904091539 ./app-editors/vim/vim-9999.ebuild
+1904111609 ./app-editors/vim/vim-9999.ebuild
 1904012309 ./app-editors/tea/tea-47.0.0.ebuild
 1702282250 ./app-editors/le/le-1.16.1.ebuild
 1702282250 ./app-editors/le/le-1.14.3.ebuild
@@ -11526,6 +11457,8 @@
 1711251740 ./dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild
 1711251740 ./dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild
 1903221909 ./dev-lang/go/go-9999.ebuild
+1904110139 ./dev-lang/go/go-1.12.3.ebuild
+1904110139 ./dev-lang/go/go-1.11.8.ebuild
 1904022009 ./dev-lang/go/go-1.11.6.ebuild
 1904070009 ./dev-lang/go/go-1.11.7.ebuild
 1903280309 ./dev-lang/go/go-1.12.1.ebuild
@@ -11782,8 +11715,6 @@
 1805132239 ./dev-lang/tcc/tcc-0.9.27.ebuild
 1805132239 ./dev-lang/tcc/tcc-0.9.26-r3.ebuild
 1805132239 ./dev-lang/tcc/tcc-9999.ebuild
-1805132239 ./dev-lang/tcc/tcc-0.9.26-r1.ebuild
-1805132239 ./dev-lang/tcc/tcc-0.9.26-r2.ebuild
 1706031528 ./dev-lang/lfe/lfe-1.0.ebuild
 1705301832 ./dev-lang/lfe/lfe-0.10.1.ebuild
 1706031528 ./dev-lang/lfe/lfe-1.1.1.ebuild
@@ -11913,7 +11844,7 @@
 1903281139 ./dev-python/semver/semver-2.8.1.ebuild
 1812030609 ./dev-python/PySDL2/PySDL2-0.9.6.ebuild
 1804262239 ./dev-python/storm/storm-0.20-r1.ebuild
-1804262239 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
+1904110209 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
 1810301239 ./dev-python/markdown/markdown-3.0.1.ebuild
 1804290108 ./dev-python/markdown/markdown-2.6.8.ebuild
 1804290108 ./dev-python/markdown/markdown-2.6.5.ebuild
@@ -11945,6 +11876,7 @@
 1812130339 ./dev-python/pytoml/pytoml-0.1.20.ebuild
 1707090132 ./dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
 1711290710 ./dev-python/ipynb/ipynb-0.5.1.ebuild
+1904110139 ./dev-python/rq/rq-0.13.0.ebuild
 1804262239 ./dev-python/bashate/bashate-0.3.1.ebuild
 1902120009 ./dev-python/bashate/bashate-0.6.0.ebuild
 1804192239 ./dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
@@ -12079,7 +12011,7 @@
 1809190209 ./dev-python/jaraco-itertools/jaraco-itertools-2.5.2.ebuild
 1810291339 ./dev-python/jaraco-itertools/jaraco-itertools-3.0.0.ebuild
 1806260239 ./dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
-1806262139 ./dev-python/tooz/tooz-1.60.1.ebuild
+1904110209 ./dev-python/tooz/tooz-1.60.1.ebuild
 1901280339 ./dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
 1809290009 ./dev-python/flask/flask-1.0.2.ebuild
 1808210539 ./dev-python/flask/flask-9999.ebuild
@@ -12141,6 +12073,7 @@
 1904091039 ./dev-python/routes/routes-2.4.1.ebuild
 1904091039 ./dev-python/os-testr/os-testr-1.0.0.ebuild
 1812192309 ./dev-python/python-openstackclient/python-openstackclient-3.16.2.ebuild
+1904110209 ./dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
 1812192309 ./dev-python/python-openstackclient/python-openstackclient-3.14.3.ebuild
 1708051215 ./dev-python/imapclient/imapclient-0.13.ebuild
 1903272209 ./dev-python/parametrized/parametrized-0.1.ebuild
@@ -12164,7 +12097,7 @@
 1804192239 ./dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
 1703172302 ./dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
 1709300330 ./dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
-1803310508 ./dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
+1904110209 ./dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
 1804290939 ./dev-python/tweepy/tweepy-2.3.ebuild
 1804290939 ./dev-python/tweepy/tweepy-3.5.0.ebuild
 1812031539 ./dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
@@ -12230,6 +12163,7 @@
 1804192239 ./dev-python/bjoern/bjoern-1.3.2.ebuild
 1804192239 ./dev-python/bjoern/bjoern-1.4.3.ebuild
 1904090439 ./dev-python/hypothesis/hypothesis-3.74.3.ebuild
+1904110909 ./dev-python/hypothesis/hypothesis-4.15.0.ebuild
 1806302039 ./dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
 1902121139 ./dev-python/hypothesis/hypothesis-3.59.1.ebuild
 1812131009 ./dev-python/hypothesis/hypothesis-3.83.1.ebuild
@@ -12239,8 +12173,10 @@
 1903170339 ./dev-python/qrcode/qrcode-5.1-r1.ebuild
 1806241739 ./dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
 1802131908 ./dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
+1904110209 ./dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
 1809290009 ./dev-python/python-novaclient/python-novaclient-11.0.0.ebuild
 1804262239 ./dev-python/filemagic/filemagic-1.6.ebuild
+1904110209 ./dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
 1806262109 ./dev-python/oslo-reports/oslo-reports-1.26.0.ebuild
 1901280339 ./dev-python/numpydoc/numpydoc-0.7.0.ebuild
 1804262239 ./dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -12284,6 +12220,7 @@
 1811020239 ./dev-python/pytest-datafiles/pytest-datafiles-2.0.ebuild
 1804192239 ./dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
 1709300229 ./dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild
+1904110209 ./dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
 1904100839 ./dev-python/python-barbicanclient/python-barbicanclient-4.6.0.ebuild
 1706282120 ./dev-python/iminuit/iminuit-1.2.ebuild
 1811111739 ./dev-python/iminuit/iminuit-1.3.3.ebuild
@@ -12329,7 +12266,7 @@
 1901280339 ./dev-python/sympy/sympy-1.3.ebuild
 1804051913 ./dev-python/sympy/sympy-1.1.1.ebuild
 1901280339 ./dev-python/sympy/sympy-1.0-r1.ebuild
-1806141939 ./dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
+1904110209 ./dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
 1804192239 ./dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
 1811011909 ./dev-python/git-review/git-review-1.27.0.ebuild
 1802201938 ./dev-python/git-review/git-review-1.26.0.ebuild
@@ -12528,6 +12465,7 @@
 1802131708 ./dev-python/docker-py/docker-py-2.7.0.ebuild
 1903101209 ./dev-python/docker-py/docker-py-3.6.0.ebuild
 1802131708 ./dev-python/docker-py/docker-py-2.4.2.ebuild
+1904111439 ./dev-python/docker-py/docker-py-3.7.0.ebuild
 1811071609 ./dev-python/docker-py/docker-py-3.5.1.ebuild
 1804262239 ./dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
 1808210539 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
@@ -12640,7 +12578,7 @@
 1812070009 ./dev-python/pytables/pytables-3.4.2.ebuild
 1901190139 ./dev-python/pytables/pytables-3.4.4.ebuild
 1903010339 ./dev-python/twitter/twitter-1.18.0.ebuild
-1806260239 ./dev-python/pyudev/pyudev-0.21.0.ebuild
+1904110209 ./dev-python/pyudev/pyudev-0.21.0.ebuild
 1805101138 ./dev-python/pyudev/pyudev-0.20.0-r1.ebuild
 1709241728 ./dev-python/geopy/geopy-1.11.0.ebuild
 1903201339 ./dev-python/incremental/incremental-17.5.0.ebuild
@@ -13074,7 +13012,7 @@
 1903260039 ./dev-python/keyring/keyring-18.0.1.ebuild
 1806141939 ./dev-python/keyring/keyring-12.2.1.ebuild
 1809051639 ./dev-python/keyring/keyring-13.2.1-r1.ebuild
-1807252339 ./dev-python/keyring/keyring-13.2.1.ebuild
+1904110209 ./dev-python/keyring/keyring-13.2.1.ebuild
 1811101739 ./dev-python/pew/pew-1.1.1.ebuild
 1903100609 ./dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
 1806241839 ./dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
@@ -13121,6 +13059,7 @@
 1806241839 ./dev-python/line_profiler/line_profiler-9999.ebuild
 1804262239 ./dev-python/line_profiler/line_profiler-2.1.2.ebuild
 1901252309 ./dev-python/psutil/psutil-5.4.7.ebuild
+1904110209 ./dev-python/psutil/psutil-5.6.0.ebuild
 1804192239 ./dev-python/psutil/psutil-5.4.1.ebuild
 1901252309 ./dev-python/psutil/psutil-5.4.8.ebuild
 1904081809 ./dev-python/psutil/psutil-5.5.0.ebuild
@@ -13236,7 +13175,7 @@
 1806262209 ./dev-python/vcstools/vcstools-9999.ebuild
 1804262239 ./dev-python/envisage/envisage-4.4.0.ebuild
 1703260624 ./dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
-1903102139 ./dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
+1904110209 ./dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
 1803060308 ./dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
 1806260509 ./dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild
 1702282250 ./dev-python/qpid-python/qpid-python-0.20.ebuild
@@ -13475,6 +13414,7 @@
 1903110109 ./dev-python/attrs/attrs-18.2.0.ebuild
 1811200039 ./dev-python/attrs/attrs-18.1.0.ebuild
 1804262239 ./dev-python/attrs/attrs-16.3.0-r1.ebuild
+1904110909 ./dev-python/attrs/attrs-19.1.0.ebuild
 1804262239 ./dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
 1901311239 ./dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
 1812082109 ./dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
@@ -13605,6 +13545,7 @@
 1807162309 ./dev-python/unittest2/unittest2-1.1.0.ebuild
 1902011909 ./dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
 1804262239 ./dev-python/minimock/minimock-1.2.8-r1.ebuild
+1904110209 ./dev-python/oauth2client/oauth2client-4.1.3.ebuild
 1703172259 ./dev-python/oauth2client/oauth2client-2.2.0.ebuild
 1709300330 ./dev-python/oauth2client/oauth2client-4.1.2.ebuild
 1703172259 ./dev-python/oauth2client/oauth2client-2.0.1.ebuild
@@ -13749,7 +13690,7 @@
 1806242309 ./dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
 1806242309 ./dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
 1810271109 ./dev-python/simpleeval/simpleeval-0.9.8.ebuild
-1712122339 ./dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
+1904110209 ./dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
 1806241839 ./dev-python/maybe/maybe-0.4.0.ebuild
 1811261809 ./dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
 1705151648 ./dev-python/corner/corner-2.0.1.ebuild
@@ -13852,7 +13793,7 @@
 1806280109 ./dev-python/pysmi/pysmi-0.1.3.ebuild
 1708051212 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
 1903232309 ./dev-python/secretstorage/secretstorage-3.1.0.ebuild
-1804262239 ./dev-python/secretstorage/secretstorage-2.3.1.ebuild
+1904110209 ./dev-python/secretstorage/secretstorage-2.3.1.ebuild
 1903120009 ./dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
 1806191709 ./dev-python/junit-xml/junit-xml-1.8.ebuild
 1806242239 ./dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2.ebuild
@@ -14007,6 +13948,7 @@
 1808030509 ./dev-python/django-otp/django-otp-0.4.3.ebuild
 1805082308 ./dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
 1811011409 ./dev-python/pyjade/pyjade-4.0.0.ebuild
+1904110209 ./dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
 1806241739 ./dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild
 1809290009 ./dev-python/python-neutronclient/python-neutronclient-6.9.0.ebuild
 1709300230 ./dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild
@@ -14062,6 +14004,7 @@
 1804262239 ./dev-python/decorator/decorator-4.1.2.ebuild
 1804262239 ./dev-python/decorator/decorator-4.2.1.ebuild
 1807162309 ./dev-python/decorator/decorator-4.3.0.ebuild
+1904111739 ./dev-python/decorator/decorator-4.3.2.ebuild
 1702282250 ./dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
 1705111618 ./dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
 1806192239 ./dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
@@ -14126,13 +14069,14 @@
 1903232309 ./dev-python/more-itertools/more-itertools-6.0.0.ebuild
 1904090139 ./dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
 1903232309 ./dev-python/more-itertools/more-itertools-5.0.0.ebuild
+1904110909 ./dev-python/more-itertools/more-itertools-7.0.0.ebuild
 1901180009 ./dev-python/bleach/bleach-2.1.3.ebuild
 1901171939 ./dev-python/bleach/bleach-3.1.0.ebuild
 1902081139 ./dev-python/bleach/bleach-3.0.2.ebuild
 1804262239 ./dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
 1901282339 ./dev-python/httplib2/httplib2-0.11.3.ebuild
 1804262239 ./dev-python/httplib2/httplib2-0.10.3-r1.ebuild
-1904100839 ./dev-python/httplib2/httplib2-0.12.1.ebuild
+1904102039 ./dev-python/httplib2/httplib2-0.12.1.ebuild
 1705291932 ./dev-python/python-cluster/python-cluster-1.2.2.ebuild
 1811190009 ./dev-python/filelock/filelock-3.0.10.ebuild
 1808310239 ./dev-python/python-etcd/python-etcd-0.3.2.ebuild
@@ -14220,6 +14164,7 @@
 1903262209 ./dev-python/dask/dask-0.15.1.ebuild
 1903262209 ./dev-python/dask/dask-0.10.2.ebuild
 1904100839 ./dev-python/dask/dask-1.1.3.ebuild
+1904110139 ./dev-python/django-rq/django-rq-1.3.1.ebuild
 1901280339 ./dev-python/voluptuous/voluptuous-0.10.5.ebuild
 1901280339 ./dev-python/voluptuous/voluptuous-0.11.1.ebuild
 1904091039 ./dev-python/pyjwt/pyjwt-1.7.1.ebuild
@@ -14686,6 +14631,7 @@
 1804262239 ./dev-python/zope-testing/zope-testing-4.6.2.ebuild
 1903100609 ./dev-python/zope-testing/zope-testing-4.7.ebuild
 1705311030 ./dev-python/munch/munch-2.1.1.ebuild
+1904110209 ./dev-python/munch/munch-2.3.2.ebuild
 1803310508 ./dev-python/munch/munch-2.2.0.ebuild
 1902190039 ./dev-python/nototools/nototools-20180827.ebuild
 1704261933 ./dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
@@ -14720,9 +14666,11 @@
 1903311609 ./dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
 1903311709 ./dev-python/termcolor/termcolor-1.1.0-r1.ebuild
 1809290009 ./dev-python/osc-lib/osc-lib-1.11.1.ebuild
+1904110209 ./dev-python/osc-lib/osc-lib-1.12.1.ebuild
 1806241739 ./dev-python/osc-lib/osc-lib-1.9.0.ebuild
 1709300230 ./dev-python/osc-lib/osc-lib-1.7.0.ebuild
 1901280339 ./dev-python/os-client-config/os-client-config-1.29.0.ebuild
+1904110209 ./dev-python/os-client-config/os-client-config-1.32.0.ebuild
 1901280339 ./dev-python/pyglet/pyglet-1.2.4.ebuild
 1709030403 ./dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
 1902010939 ./dev-python/aiosmtpd/aiosmtpd-1.0.ebuild
@@ -14905,6 +14853,7 @@
 1809290009 ./dev-python/openstacksdk/openstacksdk-0.17.2.ebuild
 1806241739 ./dev-python/openstacksdk/openstacksdk-0.11.3.ebuild
 1709300230 ./dev-python/openstacksdk/openstacksdk-0.9.17.ebuild
+1904110209 ./dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
 1804262239 ./dev-python/morbid/morbid-0.8.7.3-r1.ebuild
 1709030403 ./dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
 1804262239 ./dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
@@ -14972,9 +14921,9 @@
 1804291038 ./dev-python/cherrypy/cherrypy-3.8.0.ebuild
 1804262239 ./dev-python/mocker/mocker-1.1.1-r1.ebuild
 1804192239 ./dev-python/keyczar/keyczar-0.715.ebuild
-1804192239 ./dev-python/google-auth/google-auth-1.0.1.ebuild
+1904110209 ./dev-python/google-auth/google-auth-1.0.1.ebuild
 1804192239 ./dev-python/google-auth/google-auth-1.1.0.ebuild
-1805231339 ./dev-python/google-auth/google-auth-1.4.1.ebuild
+1904110209 ./dev-python/google-auth/google-auth-1.4.1.ebuild
 1811020209 ./dev-python/fqdn/fqdn-1.1.1.ebuild
 1808051709 ./dev-python/batinfo/batinfo-0.4.2.ebuild
 1806272339 ./dev-python/batinfo/batinfo-0.3.ebuild
@@ -14996,8 +14945,8 @@
 1702282250 ./dev-python/shm/shm-1.2.2-r1.ebuild
 1901030039 ./dev-python/snakeoil/snakeoil-9999.ebuild
 1901050209 ./dev-python/snakeoil/snakeoil-0.7.5.ebuild
-1804262239 ./dev-python/rsa/rsa-3.2.3-r1.ebuild
-1804262239 ./dev-python/rsa/rsa-3.4.2.ebuild
+1904110209 ./dev-python/rsa/rsa-3.2.3-r1.ebuild
+1904110209 ./dev-python/rsa/rsa-3.4.2.ebuild
 1904100839 ./dev-python/joblib/joblib-0.12.2.ebuild
 1809121239 ./dev-python/joblib/joblib-0.10.0.ebuild
 1809121239 ./dev-python/joblib/joblib-0.11.ebuild
@@ -15030,6 +14979,7 @@
 1808170509 ./dev-python/fonttools/fonttools-3.28.0.ebuild
 1804262239 ./dev-python/pychecker/pychecker-0.8.19-r1.ebuild
 1809290009 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-1.33.3.ebuild
+1904110209 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
 1804262239 ./dev-python/regendoc/regendoc-0.5.ebuild
 1804262239 ./dev-python/regendoc/regendoc-0.6.1.ebuild
 1804262239 ./dev-python/traits/traits-4.5.0.ebuild
@@ -15153,7 +15103,7 @@
 1901072239 ./dev-python/vertex/vertex-0.3.0-r1.ebuild
 1804262239 ./dev-python/vertex/vertex-0.3.1-r1.ebuild
 1804262239 ./dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
-1804262239 ./dev-python/uritemplate/uritemplate-3.0.0.ebuild
+1904110209 ./dev-python/uritemplate/uritemplate-3.0.0.ebuild
 1804262239 ./dev-python/uritemplate/uritemplate-0.6.ebuild
 1712282239 ./dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
 1903280039 ./dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
@@ -15199,9 +15149,7 @@
 1804262239 ./dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
 1702282250 ./dev-python/pymetar/pymetar-0.21.ebuild
 1812271509 ./dev-python/pymetar/pymetar-1.1.ebuild
-1809161639 ./dev-python/miniupnpc/miniupnpc-2.0.20180503.ebuild
 1904082239 ./dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
-1904050839 ./dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
 1904012039 ./dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
 1808051739 ./dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
 1804262239 ./dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -16032,7 +15980,7 @@
 1702282250 ./app-shells/bashish/bashish-2.2.4.ebuild
 1707171556 ./app-shells/ccsh/ccsh-0.0.4-r4.ebuild
 1808160239 ./app-shells/autojump/autojump-22.5.1.ebuild
-1904091939 ./app-shells/autojump/autojump-22.5.3.ebuild
+1904111139 ./app-shells/autojump/autojump-22.5.3.ebuild
 1704221256 ./app-shells/autojump/autojump-22.2.4-r4.ebuild
 1702282250 ./app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild
 1806191039 ./app-shells/peco/peco-0.5.3.ebuild
@@ -16208,7 +16156,7 @@
 1902100809 ./net-im/bitlbee/bitlbee-9999.ebuild
 1807111209 ./net-im/ricochet/ricochet-1.1.4.ebuild
 1807111209 ./net-im/ricochet/ricochet-9999.ebuild
-1811181339 ./net-im/skypeforlinux/skypeforlinux-8.34.0.78.ebuild
+1904112309 ./net-im/skypeforlinux/skypeforlinux-8.34.0.78-r1.ebuild
 1810122239 ./net-im/qtox/qtox-1.16.3.ebuild
 1810122239 ./net-im/qtox/qtox-9999.ebuild
 1702282250 ./net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
@@ -16226,6 +16174,7 @@
 1901191739 ./dev-cpp/ms-gsl/ms-gsl-9999.ebuild
 1810141209 ./dev-cpp/websocketpp/websocketpp-0.8.1.ebuild
 1902172109 ./dev-cpp/nlohmann_json/nlohmann_json-3.5.0.ebuild
+1904110909 ./dev-cpp/nlohmann_json/nlohmann_json-3.6.1.ebuild
 1705071610 ./dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
 1702282250 ./dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
 1702282250 ./dev-cpp/random123/random123-1.09-r1.ebuild
@@ -16251,7 +16200,6 @@
 1702282250 ./dev-cpp/tree/tree-2.81.ebuild
 1901191739 ./dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild
 1903291239 ./dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild
-1901191739 ./dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1-r1.ebuild
 1810072009 ./dev-cpp/aixlog/aixlog-1.2.1.ebuild
 1810072009 ./dev-cpp/aixlog/aixlog-9999.ebuild
 1801041239 ./dev-cpp/gflags/gflags-2.2.1.ebuild
@@ -16349,8 +16297,8 @@
 1903110209 ./app-office/moneydance/moneydance-2019.1.ebuild
 1901300209 ./app-office/moneydance/moneydance-2017.10.ebuild
 1702282250 ./app-office/ical/ical-3.0-r2.ebuild
+1904111209 ./app-office/libreoffice/libreoffice-6.2.3.2.ebuild
 1904031509 ./app-office/libreoffice/libreoffice-9999.ebuild
-1904031509 ./app-office/libreoffice/libreoffice-6.2.3.1.ebuild
 1903301309 ./app-office/libreoffice/libreoffice-6.2.2.2.ebuild
 1902172109 ./app-office/libreoffice/libreoffice-6.1.5.2.ebuild
 1904031509 ./app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -16397,6 +16345,7 @@
 1803301639 ./app-office/pinpoint/pinpoint-0.1.8-r1.ebuild
 1707291840 ./app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
 1901091639 ./app-office/gnucash/gnucash-3.4.ebuild
+1904101439 ./app-office/gnucash/gnucash-3.5.ebuild
 1811101509 ./app-office/gnucash/gnucash-3.3.ebuild
 1811281709 ./app-office/gnucash/gnucash-3.3-r1.ebuild
 1810070109 ./app-office/gnucash/gnucash-3.2-r2.ebuild
@@ -16537,7 +16486,7 @@
 1904011809 ./net-analyzer/wireshark/wireshark-99999999.ebuild
 1903170209 ./net-analyzer/wireshark/wireshark-2.6.7.ebuild
 1903192239 ./net-analyzer/wireshark/wireshark-3.0.0-r1.ebuild
-1904100009 ./net-analyzer/wireshark/wireshark-3.0.1.ebuild
+1904102009 ./net-analyzer/wireshark/wireshark-3.0.1.ebuild
 1702282250 ./net-analyzer/ftester/ftester-1.0.ebuild
 1807241639 ./net-analyzer/wapiti/wapiti-3.0.1.ebuild
 1801091709 ./net-analyzer/wapiti/wapiti-9999.ebuild
@@ -16649,7 +16598,7 @@
 1702282250 ./net-analyzer/pbnj/pbnj-2.04.ebuild
 1702282250 ./net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
 1805260039 ./net-analyzer/argus/argus-3.0.8.2-r1.ebuild
-1904060039 ./net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
+1904102009 ./net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
 1902032009 ./net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
 1902032009 ./net-analyzer/tcpreplay/tcpreplay-999999.ebuild
 1702282250 ./net-analyzer/alive/alive-2.0.2.ebuild
@@ -17524,7 +17473,6 @@
 1702282250 ./app-misc/linux-logo/linux-logo-5.11-r3.ebuild
 1804011738 ./app-misc/linux-logo/linux-logo-5.11-r4.ebuild
 1904100039 ./app-misc/bijiben/bijiben-3.26.2.ebuild
-1902222109 ./app-misc/bijiben/bijiben-3.26.1.ebuild
 1702282250 ./app-misc/pip/pip-1.2-r2.ebuild
 1702282250 ./app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild
 1703041646 ./app-misc/socnetv/socnetv-2.2.ebuild
@@ -17692,7 +17640,6 @@
 1903202339 ./app-misc/pdfpc/pdfpc-4.3.2.ebuild
 1802252138 ./app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
 1710251228 ./app-misc/gourmet/gourmet-0.17.4-r2.ebuild
-1902140309 ./app-misc/tracker/tracker-1.12.4-r1.ebuild
 1904100039 ./app-misc/tracker/tracker-2.1.8.ebuild
 1706041342 ./app-misc/gramps/gramps-4.2.5.ebuild
 1810111809 ./app-misc/gramps/gramps-5.0.0.ebuild
@@ -17756,9 +17703,9 @@
 1902192109 ./net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild
 1902192109 ./net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
 1811021639 ./net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
-1903301639 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.40_beta.ebuild
-1903210309 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.86.ebuild
-1903301639 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3745.4_alpha.ebuild
+1904110439 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3759.4_alpha.ebuild
+1904110439 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.103.ebuild
+1904110439 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.75_beta.ebuild
 1902052309 ./www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
 1902052309 ./www-plugins/google-talkplugin/google-talkplugin-5.41.0.0.ebuild
 1902052309 ./www-plugins/google-talkplugin/google-talkplugin-5.41.3.0.ebuild
@@ -17802,6 +17749,7 @@
 1903111739 ./media-radio/xlog/xlog-2.0.17.ebuild
 1805031339 ./media-radio/wsjtx/wsjtx-1.8.0.ebuild
 1812202239 ./media-radio/wsjtx/wsjtx-2.0.0-r1.ebuild
+1904101739 ./media-radio/wsjtx/wsjtx-2.0.1.ebuild
 1806142139 ./media-radio/wsjtx/wsjtx-1.9.1.ebuild
 1805090108 ./media-radio/gpredict/gpredict-2.2.ebuild
 1807091839 ./media-radio/gpredict/gpredict-2.2.1.ebuild
@@ -17922,7 +17870,7 @@
 1805012209 ./dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.13.ebuild
 1805012209 ./dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.9.ebuild
 1805012209 ./dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.14.ebuild
-1902142039 ./dev-embedded/platformio/platformio-3.6.4.ebuild
+1904101439 ./dev-embedded/platformio/platformio-3.6.6.ebuild
 1805012209 ./dev-embedded/zmac/zmac-1.3.ebuild
 1702282250 ./dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
 1702282250 ./dev-embedded/avarice/avarice-2.13.ebuild
@@ -18968,7 +18916,6 @@
 1702282250 ./app-text/asa/asa-1.1-r1.ebuild
 1904100039 ./app-text/libgepub/libgepub-0.5.3.ebuild
 1903172009 ./app-text/libgepub/libgepub-0.6.0.ebuild
-1902152109 ./app-text/libgepub/libgepub-0.4.ebuild
 1707310220 ./app-text/wdiff/wdiff-1.2.2-r1.ebuild
 1702282250 ./app-text/wdiff/wdiff-1.2.2.ebuild
 1702282250 ./app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
@@ -19493,6 +19440,7 @@
 1702282250 ./www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
 1702282250 ./www-apps/webdavcgi/webdavcgi-1.1.1.ebuild
 1903160209 ./www-apps/gitea/gitea-1.7.4.ebuild
+1904120009 ./www-apps/netbox/netbox-2.5.10.ebuild
 1902090209 ./www-apps/karma-bin/karma-bin-0.24.ebuild
 1903061939 ./www-apps/karma-bin/karma-bin-0.27.ebuild
 1707301222 ./www-apps/blohg-tumblelog/blohg-tumblelog-0.2.ebuild
@@ -19514,6 +19462,7 @@
 1903131709 ./www-apps/grafana-bin/grafana-bin-6.0.1.ebuild
 1904081709 ./www-apps/grafana-bin/grafana-bin-6.1.2.ebuild
 1903040439 ./www-apps/grafana-bin/grafana-bin-6.0.0-r1.ebuild
+1904101209 ./www-apps/grafana-bin/grafana-bin-6.1.3.ebuild
 1904051639 ./www-apps/grafana-bin/grafana-bin-6.1.1.ebuild
 1903072009 ./www-apps/rt/rt-4.4.3.ebuild
 1801262008 ./www-apps/rt/rt-4.4.2.ebuild
@@ -19531,6 +19480,7 @@
 1709241359 ./www-apps/nikola/nikola-7.8.8.ebuild
 1702282250 ./www-apps/venus/venus-20100911-r1.ebuild
 1703180334 ./www-apps/venus/venus-20100911-r2.ebuild
+1904101639 ./www-apps/piwigo/piwigo-2.9.5.ebuild
 1807161909 ./www-apps/piwigo/piwigo-2.9.4.ebuild
 1805012209 ./www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
 1706062046 ./www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
@@ -20009,7 +19959,6 @@
 1702282250 ./dev-util/obs-service-generator_driver_update_disk/obs-service-generator_driver_update_disk-20130318.ebuild
 1903141539 ./dev-util/debugedit/debugedit-4.14.2-r1.ebuild
 1808310239 ./dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
-1809200139 ./dev-util/debugedit/debugedit-4.14.2.ebuild
 1711280140 ./dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
 1708142047 ./dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild
 1809060039 ./dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
@@ -20035,7 +19984,6 @@
 1702282250 ./dev-util/ald/ald-0.1.7-r2.ebuild
 1807091839 ./dev-util/wxglade/wxglade-0.8.2.ebuild
 1702282250 ./dev-util/fuzz/fuzz-0.6-r1.ebuild
-1903202209 ./dev-util/cucumber/cucumber-3.0.2-r1.ebuild
 1903202209 ./dev-util/cucumber/cucumber-3.1.2.ebuild
 1806182139 ./dev-util/cucumber/cucumber-2.4.0-r1.ebuild
 1811251839 ./dev-util/w32api/w32api-4.0.3.1.ebuild
@@ -20107,7 +20055,6 @@
 1802072238 ./dev-util/patchbin/patchbin-99999999.ebuild
 1802072238 ./dev-util/patchbin/patchbin-20160208.ebuild
 1804032208 ./dev-util/hxtools/hxtools-20180301.ebuild
-1702282250 ./dev-util/hxtools/hxtools-20121125-r1.ebuild
 1810042039 ./dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild
 1806170109 ./dev-util/creduce/creduce-2.7.0-r1.ebuild
 1810031209 ./dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
@@ -20230,6 +20177,7 @@
 1901170109 ./dev-util/ragel/ragel-6.10.ebuild
 1703011605 ./dev-util/ragel/ragel-6.8.ebuild
 1702282250 ./dev-util/obs-service-recompress/obs-service-recompress-0.2.ebuild
+1904110809 ./dev-util/repo/repo-1.13.2.ebuild
 1712200239 ./dev-util/repo/repo-1.12.37.ebuild
 1811300109 ./dev-util/statifier/statifier-1.7.4.ebuild
 1903120109 ./dev-util/sysdig/sysdig-0.24.2.ebuild
@@ -20446,6 +20394,7 @@
 1804130008 ./dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
 1805152308 ./dev-util/drone-cli/drone-cli-0.8.6.ebuild
 1901151839 ./dev-util/drone-cli/drone-cli-1.0.5.ebuild
+1904111439 ./dev-util/drone-cli/drone-cli-1.0.8.ebuild
 1902221639 ./dev-util/drone-cli/drone-cli-1.0.7.ebuild
 1702282250 ./dev-util/findbugs/findbugs-3.0.1.ebuild
 1902221739 ./dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
@@ -20514,7 +20463,7 @@
 1810230139 ./dev-util/cbindgen/cbindgen-0.6.6.ebuild
 1702282250 ./dev-util/shunit2/shunit2-2.1.6-r1.ebuild
 1903041809 ./dev-util/meson/meson-9999.ebuild
-1904100539 ./dev-util/meson/meson-0.49.2.ebuild
+1904102009 ./dev-util/meson/meson-0.49.2.ebuild
 1901172109 ./dev-util/meson/meson-0.48.2.ebuild
 1901080239 ./dev-util/ostree/ostree-2018.9.ebuild
 1901072239 ./dev-util/ostree/ostree-2018.5.ebuild
@@ -20551,9 +20500,7 @@
 1705252354 ./dev-util/open-vcdiff/open-vcdiff-0.8.4-r1.ebuild
 1702282250 ./dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
 1702282250 ./dev-util/visual-regexp/visual-regexp-3.1.ebuild
-1807130039 ./dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
 1901202209 ./dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
-1807130039 ./dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
 1904031839 ./dev-util/kdbg/kdbg-3.0.0-r1.ebuild
 1708111614 ./dev-util/rpmdevtools/rpmdevtools-8.10.ebuild
 1901160239 ./dev-util/geany-plugins/geany-plugins-1.34.ebuild
@@ -20710,7 +20657,6 @@
 1810141509 ./dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
 1702282250 ./dev-util/bsdiff/bsdiff-4.3-r3.ebuild
 1806041308 ./dev-util/cucumber-rails/cucumber-rails-1.6.0.ebuild
-1801230008 ./dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
 1702282250 ./dev-util/crash/crash-7.0.0.ebuild
 1702282250 ./dev-util/crash/crash-7.0.7.ebuild
 1904090309 ./dev-util/crash/crash-7.2.5.ebuild
@@ -22661,6 +22607,7 @@
 1903240309 ./app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
 1811280109 ./app-admin/mcelog/mcelog-161.ebuild
 1902061709 ./app-admin/mcelog/mcelog-162.ebuild
+1904110139 ./app-admin/supervisor/supervisor-4.0.1.ebuild
 1904070409 ./app-admin/supervisor/supervisor-4.0.0.ebuild
 1812232339 ./app-admin/supervisor/supervisor-3.3.5.ebuild
 1804262239 ./app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -22685,6 +22632,7 @@
 1811071809 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
 1903101639 ./app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
 1903251509 ./app-admin/keepassxc/keepassxc-2.4.0.ebuild
+1904112009 ./app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
 1903251509 ./app-admin/keepassxc/keepassxc-9999.ebuild
 1903020839 ./app-admin/cli53/cli53-0.8.14.ebuild
 1903020839 ./app-admin/cli53/cli53-9999.ebuild
@@ -22758,6 +22706,7 @@
 1702282250 ./app-admin/genromfs/genromfs-0.5.2.ebuild
 1806081509 ./app-admin/killproc/killproc-2.13-r1.ebuild
 1805012209 ./app-admin/consolehm/consolehm-1.31.ebuild
+1904110039 ./app-admin/glance/glance-18.0.0.ebuild
 1904100839 ./app-admin/glance/glance-2019.1.9999.ebuild
 1809290009 ./app-admin/glance/glance-17.0.0.ebuild
 1808302139 ./app-admin/glance/glance-2018.2.9999.ebuild
@@ -23420,6 +23369,7 @@
 1804091508 ./mail-mta/courier/courier-0.78.2.ebuild
 1702282250 ./mail-mta/courier/courier-0.76.4.ebuild
 1903092239 ./mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.3.ebuild
+1904102139 ./mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild
 1805291938 ./mail-mta/esmtp/esmtp-1.2-r1.ebuild
 1805012209 ./mail-mta/esmtp/esmtp-1.2.ebuild
 1807101539 ./xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
@@ -23446,8 +23396,8 @@
 1811152009 ./xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0-r1.ebuild
 1904072039 ./xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.0.ebuild
 1808290439 ./xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
-1904091939 ./xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
-1904091939 ./xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
+1904101139 ./xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
+1904101139 ./xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
 1807101539 ./xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
 1811152009 ./xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
 1904080039 ./xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.2.ebuild
@@ -23458,7 +23408,7 @@
 1807101539 ./xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
 1904071809 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.5.ebuild
 1812021439 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.3.ebuild
-1904091939 ./xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
+1904101139 ./xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
 1807101539 ./xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild
 1904071809 ./xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.3.2.ebuild
 1807101539 ./xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild
@@ -23484,10 +23434,10 @@
 1708050006 ./xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild
 1901212309 ./xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
 1704231121 ./xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
-1904091939 ./xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
+1904101139 ./xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
 1708050006 ./xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild
 1807101539 ./xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
-1904091739 ./xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
+1904101139 ./xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
 1807101539 ./xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
 1807101539 ./xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
 1811152009 ./xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
@@ -23553,7 +23503,7 @@
 1702282250 ./sci-mathematics/msieve/msieve-1.51.ebuild
 1901070109 ./sci-mathematics/msieve/msieve-1.53.ebuild
 1903212109 ./sci-mathematics/z3/z3-4.8.4.ebuild
-1704261112 ./sci-mathematics/z3/z3-4.4.1.ebuild
+1904102109 ./sci-mathematics/z3/z3-4.4.1.ebuild
 1704261112 ./sci-mathematics/z3/z3-4.5.0.ebuild
 1702282250 ./sci-mathematics/gwnum/gwnum-277.ebuild
 1702282250 ./sci-mathematics/mlpy/mlpy-3.5.0.ebuild
@@ -23710,8 +23660,7 @@
 1904010539 ./app-portage/gentoolkit/gentoolkit-0.4.3.ebuild
 1904010539 ./app-portage/gentoolkit/gentoolkit-9999.ebuild
 1808310239 ./app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
-1901080039 ./app-portage/eix/eix-0.33.5.ebuild
-1904090139 ./app-portage/eix/eix-0.33.7.ebuild
+1904101739 ./app-portage/eix/eix-0.33.7.ebuild
 1808310239 ./app-portage/esearch/esearch-1.3-r2.ebuild
 1803212138 ./app-portage/esearch/esearch-9999.ebuild
 1810161239 ./app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -23750,7 +23699,6 @@
 1805302308 ./app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
 1807171439 ./app-portage/gpyutils/gpyutils-9999.ebuild
 1809091009 ./app-portage/gpyutils/gpyutils-0.2.2.ebuild
-1903221339 ./app-portage/pram/pram-2-r1.ebuild
 1904071039 ./app-portage/pram/pram-3.ebuild
 1808020009 ./app-portage/gverify/gverify-1.ebuild
 1903261939 ./app-portage/prefix-toolkit/prefix-toolkit-0.ebuild
@@ -24128,8 +24076,8 @@
 1903241239 ./media-sound/aqualung/aqualung-1.0-r3.ebuild
 1810042339 ./media-sound/musepack-tools/musepack-tools-465-r1.ebuild
 1705091026 ./media-sound/a2jmidid/a2jmidid-8-r2.ebuild
-1903311409 ./media-sound/lmms/lmms-9999.ebuild
-1903311409 ./media-sound/lmms/lmms-1.2.0_rc8.ebuild
+1904111239 ./media-sound/lmms/lmms-9999.ebuild
+1904111239 ./media-sound/lmms/lmms-1.2.0_rc8.ebuild
 1902251039 ./media-sound/mpd/mpd-0.21.5.ebuild
 1904041609 ./media-sound/mpd/mpd-0.21.7.ebuild
 1902102039 ./media-sound/mpd/mpd-0.21.4-r1.ebuild
@@ -24193,7 +24141,7 @@
 1809060039 ./media-sound/beets/beets-1.4.7.ebuild
 1805012209 ./media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
 1702282250 ./media-sound/mp3info/mp3info-0.8.5a.ebuild
-1904090139 ./media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+1904110109 ./media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
 1702282250 ./media-sound/pympd/pympd-0.08.1-r1.ebuild
 1702282250 ./media-sound/gnomad/gnomad-2.9.6.ebuild
 1805060038 ./media-sound/cmusfm/cmusfm-0.3.3.ebuild
@@ -24209,7 +24157,6 @@
 1805120339 ./media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
 1902121639 ./media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
 1805290208 ./media-sound/substract_wave/substract_wave-0.3-r1.ebuild
-1901171639 ./media-sound/gnome-music/gnome-music-3.24.2.ebuild
 1904100039 ./media-sound/gnome-music/gnome-music-3.26.2.ebuild
 1903170209 ./media-sound/gnome-music/gnome-music-3.30.2.ebuild
 1702282250 ./media-sound/sonata/sonata-1.6.2.1-r1.ebuild
@@ -24666,6 +24613,7 @@
 1902021739 ./sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
 1903141809 ./sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild
 1904081009 ./sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+1904101509 ./sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
 1702240716 ./sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
 1903182009 ./sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
 1802070408 ./sys-fs/mp3fs/mp3fs-0.91-r1.ebuild
@@ -24745,7 +24693,6 @@
 1802211838 ./sys-fs/udisks/udisks-2.7.4-r1.ebuild
 1904091509 ./sys-fs/udisks/udisks-2.8.2.ebuild
 1904100009 ./sys-fs/vhba/vhba-20190302.ebuild
-1903101909 ./sys-fs/vhba/vhba-20170610.ebuild
 1903120409 ./sys-fs/dfc/dfc-3.1.1.ebuild
 1812131239 ./sys-fs/bindfs/bindfs-1.13.10.ebuild
 1903312039 ./sys-fs/bindfs/bindfs-1.13.11.ebuild
@@ -27373,6 +27320,7 @@
 1903011639 ./sys-cluster/kubelet/kubelet-1.13.4.ebuild
 1810281939 ./sys-cluster/kubelet/kubelet-1.9.11.ebuild
 1901031909 ./sys-cluster/kubelet/kubelet-1.10.12.ebuild
+1904111439 ./sys-cluster/kubelet/kubelet-1.14.1.ebuild
 1902121939 ./sys-cluster/kubelet/kubelet-1.13.3.ebuild
 1903011639 ./sys-cluster/kubelet/kubelet-1.12.6.ebuild
 1903281939 ./sys-cluster/kubelet/kubelet-1.13.5.ebuild
@@ -27414,11 +27362,14 @@
 1812262309 ./sys-cluster/keepalived/keepalived-2.0.10-r1.ebuild
 1902210109 ./sys-cluster/keepalived/keepalived-2.0.13.ebuild
 1903251909 ./sys-cluster/keepalived/keepalived-2.0.13-r1.ebuild
+1904110209 ./sys-cluster/cinder/cinder-14.0.0.ebuild
 1903261909 ./sys-cluster/cinder/cinder-13.0.4.ebuild
 1808302139 ./sys-cluster/cinder/cinder-2018.2.9999.ebuild
+1904110209 ./sys-cluster/cinder/cinder-2019.1.9999.ebuild
 1903080039 ./sys-cluster/cinder/cinder-13.0.3.ebuild
 1903281739 ./sys-cluster/kubeadm/kubeadm-1.13.5.ebuild
 1903011639 ./sys-cluster/kubeadm/kubeadm-1.13.4.ebuild
+1904111439 ./sys-cluster/kubeadm/kubeadm-1.14.1.ebuild
 1903281739 ./sys-cluster/kubeadm/kubeadm-1.14.0.ebuild
 1904031609 ./sys-cluster/kubeadm/kubeadm-1.14.0-r1.ebuild
 1805012209 ./sys-cluster/ocfs/ocfs-1.0.14.ebuild
@@ -27688,9 +27639,8 @@
 1903250709 ./x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
 1808261209 ./x11-libs/libyui-qt/libyui-qt-2.47.1.ebuild
 1808310240 ./x11-libs/libXt/libXt-1.1.5-r1.ebuild
-1904080009 ./x11-libs/pixman/pixman-0.38.2.ebuild
+1904102039 ./x11-libs/pixman/pixman-0.38.4.ebuild
 1902161109 ./x11-libs/pixman/pixman-0.36.0.ebuild
-1903182039 ./x11-libs/pixman/pixman-0.38.0.ebuild
 1904080009 ./x11-libs/pixman/pixman-9999.ebuild
 1706300122 ./x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
 1706300122 ./x11-libs/libtinynotify/libtinynotify-9999.ebuild
@@ -27729,7 +27679,7 @@
 1809281909 ./x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
 1702282250 ./x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
 1702282250 ./x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
-1806092239 ./x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+1904112239 ./x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
 1902071439 ./x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
 1901192339 ./x11-libs/gtk+/gtk+-3.24.1.ebuild
 1902121439 ./x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -28667,7 +28617,7 @@
 1810090339 ./net-dns/s6-dns/s6-dns-2.3.0.1.ebuild
 1904090009 ./net-dns/libidn2/libidn2-2.0.5.ebuild
 1808310240 ./net-dns/libidn2/libidn2-2.0.4.ebuild
-1904080909 ./net-dns/libidn2/libidn2-2.1.1a.ebuild
+1904101809 ./net-dns/libidn2/libidn2-2.1.1a.ebuild
 1709021756 ./net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
 1709021756 ./net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
 1902182239 ./net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
@@ -28677,7 +28627,6 @@
 1805012209 ./net-dns/bind-dns-keygen/bind-dns-keygen-9.3.2.39-r1.ebuild
 1803052038 ./net-dns/idnkit/idnkit-2.3.ebuild
 1805271938 ./net-dns/idnkit/idnkit-1.0-r2.ebuild
-1901250939 ./net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
 1904022239 ./net-dns/pdns-recursor/pdns-recursor-4.1.11.ebuild
 1904031309 ./net-dns/pdns-recursor/pdns-recursor-4.1.12.ebuild
 1804051913 ./net-dns/c-ares/c-ares-1.14.0.ebuild
@@ -30262,7 +30211,7 @@
 1809011039 ./perl-core/Thread-Semaphore/Thread-Semaphore-2.120.0-r1.ebuild
 1801120740 ./perl-core/File-Path/File-Path-2.130.0.ebuild
 1809011039 ./perl-core/Math-Complex/Math-Complex-1.590.0.ebuild
-1904082209 ./perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
+1904110109 ./perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
 1810252209 ./perl-core/Math-BigInt/Math-BigInt-1.999.806.ebuild
 1702282250 ./perl-core/version/version-0.990.800.ebuild
 1806071039 ./perl-core/HTTP-Tiny/HTTP-Tiny-0.43.0.ebuild
@@ -30448,7 +30397,7 @@
 1808280039 ./games-arcade/jvgs/jvgs-0.5-r1.ebuild
 1812191739 ./games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
 1804152209 ./games-arcade/defendguin/defendguin-0.0.12-r1.ebuild
-1810142139 ./games-arcade/performous/performous-1.1-r1.ebuild
+1904112209 ./games-arcade/performous/performous-1.1-r1.ebuild
 1804242238 ./games-arcade/vor/vor-0.5.7-r1.ebuild
 1804242238 ./games-arcade/spout/spout-1.3-r1.ebuild
 1711182327 ./games-arcade/pachi/pachi-1.0.ebuild
@@ -30897,7 +30846,6 @@
 1702282250 ./net-misc/pcapfix/pcapfix-0.7.ebuild
 1702282250 ./net-misc/socket/socket-1.5.ebuild
 1904031709 ./net-misc/cni-plugins/cni-plugins-0.7.5.ebuild
-1901300209 ./net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
 1808310240 ./net-misc/keychain/keychain-2.8.1.ebuild
 1808310240 ./net-misc/keychain/keychain-2.8.5.ebuild
 1810142139 ./net-misc/electrum/electrum-3.2.3.ebuild
@@ -30976,7 +30924,6 @@
 1811081809 ./net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
 1702282250 ./net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
 1904100039 ./net-misc/rygel/rygel-0.36.2.ebuild
-1901222009 ./net-misc/rygel/rygel-0.34.0.ebuild
 1712111439 ./net-misc/batctl/batctl-2017.4.ebuild
 1706121125 ./net-misc/capi4hylafax/capi4hylafax-01.03.00.99.300.20-r2.ebuild
 1903271809 ./net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild
@@ -31130,7 +31077,7 @@
 1809151609 ./net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
 1901101339 ./net-misc/wget/wget-1.20.1.ebuild
 1904021039 ./net-misc/wget/wget-1.20.2.ebuild
-1904100739 ./net-misc/wget/wget-1.20.3.ebuild
+1904110109 ./net-misc/wget/wget-1.20.3.ebuild
 1809081239 ./net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
 1702282250 ./net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
 1806150509 ./net-misc/omnisync/omnisync-1.0_p20180614.ebuild
@@ -31184,9 +31131,8 @@
 1803132138 ./net-misc/memcached/memcached-1.4.39.ebuild
 1810110209 ./net-misc/memcached/memcached-1.5.11.ebuild
 1812290009 ./net-misc/memcached/memcached-1.5.12.ebuild
-1904061239 ./net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild
 1903141632 ./net-misc/youtube-dl/youtube-dl-99999999.ebuild
-1904070309 ./net-misc/youtube-dl/youtube-dl-2019.04.07.ebuild
+1904101309 ./net-misc/youtube-dl/youtube-dl-2019.04.07.ebuild
 1702282250 ./net-misc/dhcping/dhcping-1.2.ebuild
 1709141505 ./net-misc/sgopherd/sgopherd-17.09.ebuild
 1811071339 ./net-misc/sgopherd/sgopherd-18.08.ebuild
@@ -31226,6 +31172,7 @@
 1809051739 ./net-misc/chrony/chrony-9999.ebuild
 1803311338 ./net-misc/chrony/chrony-3.1.ebuild
 1805012209 ./net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
+1904111439 ./net-misc/istioctl/istioctl-1.1.2.ebuild
 1810302309 ./net-misc/istioctl/istioctl-1.0.2.ebuild
 1710280142 ./net-misc/axel/axel-9999.ebuild
 1710280142 ./net-misc/axel/axel-2.15.ebuild
@@ -31302,8 +31249,6 @@
 1904090139 ./net-misc/ices/ices-2.0.2.ebuild
 1805012209 ./net-misc/ices/ices-2.0.1-r1.ebuild
 1904082239 ./net-misc/miniupnpd/miniupnpd-2.1.20190408.ebuild
-1902131739 ./net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild
-1904050839 ./net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
 1702282250 ./net-misc/ris-linux/ris-linux-0.4-r1.ebuild
 1702282250 ./net-misc/switzerland/switzerland-0.1.0.ebuild
 1702282250 ./net-misc/sshpass/sshpass-1.05.ebuild
@@ -31314,7 +31259,6 @@
 1904012039 ./net-misc/hath/hath-0.5.0.ebuild
 1904100039 ./net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild
 1903181709 ./net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild
-1901181939 ./net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
 1702282250 ./net-misc/blinkperl/blinkperl-20030301-r2.ebuild
 1804120109 ./net-misc/seafile/seafile-6.1.7.ebuild
 1808091209 ./net-misc/seafile/seafile-6.2.4.ebuild
@@ -31367,6 +31311,7 @@
 1709181346 ./net-misc/felix/felix-2.5.1.ebuild
 1804092239 ./net-misc/felix/felix-3.1.0.ebuild
 1808051739 ./net-misc/felix/felix-3.1.3.ebuild
+1904101309 ./net-misc/socat/socat-1.7.3.3.ebuild
 1702282250 ./net-misc/socat/socat-2.0.0_beta9.ebuild
 1803151838 ./net-misc/socat/socat-1.7.3.2.ebuild
 1904041209 ./net-misc/socat/socat-9999.ebuild
@@ -31479,7 +31424,6 @@
 1707071449 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20170310.ebuild
 1702282250 ./net-misc/ndppd/ndppd-0.2.5.ebuild
 1702282250 ./net-misc/mrouted/mrouted-3.9.5-r1.ebuild
-1809090439 ./net-misc/aria2/aria2-1.34.0.ebuild
 1904080539 ./net-misc/aria2/aria2-1.34.0-r1.ebuild
 1812030139 ./net-misc/ena-driver/ena-driver-2.0.2.ebuild
 1805012209 ./net-misc/hashcash/hashcash-1.22-r1.ebuild
@@ -31772,7 +31716,7 @@
 1901090309 ./sys-apps/exa/exa-0.8.0-r1.ebuild
 1812010639 ./sys-apps/exa/exa-0.8.0.ebuild
 1801071809 ./sys-apps/watchdog/watchdog-5.15.ebuild
-1902171909 ./sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
+1904110509 ./sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
 1711271440 ./sys-apps/clrngd/clrngd-1.0.3.ebuild
 1808310240 ./sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
 1808310240 ./sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -31798,8 +31742,9 @@
 1705292018 ./sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
 1702282250 ./sys-apps/minised/minised-1.15.ebuild
 1811191409 ./sys-apps/util-linux/util-linux-9999.ebuild
-1903242309 ./sys-apps/util-linux/util-linux-2.33.1.ebuild
+1904102339 ./sys-apps/util-linux/util-linux-2.33.1.ebuild
 1902071239 ./sys-apps/util-linux/util-linux-2.33-r1.ebuild
+1904102339 ./sys-apps/util-linux/util-linux-2.33.2.ebuild
 1702282250 ./sys-apps/daemonize/daemonize-1.7.4.ebuild
 1810021239 ./sys-apps/daemonize/daemonize-1.7.8.ebuild
 1702282250 ./sys-apps/hardened-shadow/hardened-shadow-0.9.2.ebuild
@@ -31859,7 +31804,7 @@
 1712020139 ./sys-apps/collectl/collectl-3.7.4.ebuild
 1712302240 ./sys-apps/collectl/collectl-4.3.0.ebuild
 1712020139 ./sys-apps/collectl/collectl-4.1.0.ebuild
-1812030339 ./sys-apps/collectl/collectl-4.3.1.ebuild
+1904110209 ./sys-apps/collectl/collectl-4.3.1.ebuild
 1712020139 ./sys-apps/collectl/collectl-4.0.5.ebuild
 1712020139 ./sys-apps/collectl/collectl-4.2.0.ebuild
 1712020139 ./sys-apps/collectl/collectl-4.1.3.ebuild
@@ -32474,7 +32419,7 @@
 1702282250 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130.ebuild
 1702282250 ./media-libs/libmpeg3/libmpeg3-1.8.ebuild
 1706211336 ./media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
-1904082139 ./media-libs/tiff/tiff-4.0.10.ebuild
+1904110109 ./media-libs/tiff/tiff-4.0.10.ebuild
 1810181409 ./media-libs/tiff/tiff-4.0.9-r4.ebuild
 1803140138 ./media-libs/libicns/libicns-0.8.1.ebuild
 1809130009 ./media-libs/assimp/assimp-4.0.1.ebuild
@@ -32552,10 +32497,10 @@
 1811180409 ./media-libs/libopenraw/libopenraw-0.1.3.ebuild
 1804201108 ./media-libs/jpeg/jpeg-6b-r12.ebuild
 1804201108 ./media-libs/jpeg/jpeg-8d-r2.ebuild
-1804201108 ./media-libs/jpeg/jpeg-8d-r1.ebuild
 1809161609 ./media-libs/jpeg/jpeg-9c.ebuild
 1903230209 ./media-libs/mesa/mesa-9999.ebuild
 1903182109 ./media-libs/mesa/mesa-19.0.0.ebuild
+1904110809 ./media-libs/mesa/mesa-19.0.2.ebuild
 1904090539 ./media-libs/mesa/mesa-18.3.6.ebuild
 1903162309 ./media-libs/mesa/mesa-18.3.4.ebuild
 1903272239 ./media-libs/mesa/mesa-19.0.1.ebuild
@@ -32969,7 +32914,7 @@
 1712210109 ./media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
 1811281539 ./media-libs/rubberband/rubberband-1.8.2.ebuild
 1702282250 ./media-libs/ctl/ctl-1.4.1.ebuild
-1904082139 ./media-libs/ctl/ctl-1.5.2-r1.ebuild
+1904112239 ./media-libs/ctl/ctl-1.5.2-r1.ebuild
 1902172109 ./media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild
 1812310039 ./media-libs/libgii/libgii-1.0.2-r1.ebuild
 1904090139 ./media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -33030,7 +32975,7 @@
 1804201108 ./media-libs/giflib/giflib-5.1.4.ebuild
 1807310109 ./media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
 1810112140 ./media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
-1810112140 ./media-libs/openjpeg/openjpeg-2.3.0.ebuild
+1904111509 ./media-libs/openjpeg/openjpeg-2.3.1.ebuild
 1901291509 ./media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
 1702282250 ./media-libs/icclib/icclib-2.14.ebuild
 1702282250 ./media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild
@@ -33137,7 +33082,7 @@
 1901250609 ./media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
 1702282250 ./media-libs/gst-plugins-good/gst-plugins-good-0.10.31-r2.ebuild
 1805080038 ./media-libs/ming/ming-0.4.8-r1.ebuild
-1904080039 ./media-libs/ming/ming-0.20181112.ebuild
+1904112239 ./media-libs/ming/ming-0.20181112.ebuild
 1804252238 ./media-libs/svgalib/svgalib-1.9.25-r5.ebuild
 1807231639 ./media-libs/libsixel/libsixel-1.8.2.ebuild
 1807231639 ./media-libs/libsixel/libsixel-1.8.1.ebuild
@@ -33246,7 +33191,7 @@
 1711182327 ./games-misc/cowsay/cowsay-3.03-r2.ebuild
 1807211909 ./games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
 1707090132 ./games-misc/openmsx/openmsx-0.3.1-r2.ebuild
-1709241556 ./games-misc/lolcat/lolcat-90.8.8.ebuild
+1904111839 ./games-misc/lolcat/lolcat-90.8.8.ebuild
 1806281739 ./games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
 1806110509 ./games-misc/xpenguins/xpenguins-2.2-r2.ebuild
 1807211909 ./games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -36059,6 +36004,7 @@
 1902052309 ./app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+1904102339 ./app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -36070,7 +36016,9 @@
 1902052309 ./app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+1904102339 ./app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+1904102339 ./app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
 1902052309 ./app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
 1901010209 ./app-emulation/aqemu/aqemu-0.9.2.ebuild
 1808252339 ./app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -36099,6 +36047,7 @@
 1810311539 ./app-emulation/img/img-0.5.2.ebuild
 1807271709 ./app-emulation/img/img-0.4.8.ebuild
 1903111339 ./app-emulation/punes/punes-0.103.ebuild
+1904111309 ./app-emulation/docker-proxy/docker-proxy-0.8.0_p20190405.ebuild
 1812111339 ./app-emulation/docker-proxy/docker-proxy-0.8.0_p20180626.ebuild
 1903281809 ./app-emulation/docker-proxy/docker-proxy-0.8.0_p20190301.ebuild
 1811091139 ./app-emulation/docker-proxy/docker-proxy-0.8.0_p20180907.ebuild
@@ -36271,10 +36220,11 @@
 1812111839 ./app-emulation/vkd3d/vkd3d-9999.ebuild
 1902112309 ./app-emulation/docker/docker-18.06.2.ebuild
 1903281809 ./app-emulation/docker/docker-18.09.4.ebuild
-1806220139 ./app-emulation/docker/docker-9999.ebuild
+1904111309 ./app-emulation/docker/docker-18.09.5.ebuild
 1702282250 ./app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
 1903281809 ./app-emulation/containerd/containerd-1.2.5.ebuild
 1809261439 ./app-emulation/containerd/containerd-1.1.4.ebuild
+1904111309 ./app-emulation/containerd/containerd-1.2.6.ebuild
 1809261439 ./app-emulation/containerd/containerd-1.1.2.ebuild
 1711031726 ./app-emulation/containerd/containerd-9999.ebuild
 1811300539 ./app-emulation/wine-vanilla/wine-vanilla-3.0.4.ebuild
@@ -36404,7 +36354,6 @@
 1903040239 ./app-cdr/isoimagewriter/isoimagewriter-0.2.ebuild
 1702282250 ./app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild
 1706121548 ./app-cdr/burn-cd/burn-cd-1.8.1.ebuild
-1903101909 ./app-cdr/cdemu/cdemu-3.2.0.ebuild
 1904100009 ./app-cdr/cdemu/cdemu-3.2.1.ebuild
 1702282250 ./app-cdr/bashburn/bashburn-3.1.0.ebuild
 1712281509 ./app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
@@ -36430,7 +36379,6 @@
 1709041820 ./app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
 1805012209 ./app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild
 1803032108 ./app-cdr/burncdda/burncdda-1.8.3.ebuild
-1903101909 ./app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
 1904100009 ./app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
 1702282250 ./app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
 1805012209 ./app-cdr/mode2cdmaker/mode2cdmaker-1.5.1.ebuild
@@ -36439,7 +36387,6 @@
 1702282250 ./app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
 1809242239 ./app-cdr/geteltorito/geteltorito-0.6.ebuild
 1702282250 ./app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
-1809211439 ./app-cdr/gcdemu/gcdemu-3.2.0.ebuild
 1904100009 ./app-cdr/gcdemu/gcdemu-3.2.1.ebuild
 1806071339 ./app-cdr/cuetools/cuetools-1.4.1.ebuild
 1702282250 ./app-cdr/pburn/pburn-3.4.3.ebuild
@@ -37415,7 +37362,6 @@
 1711271440 metadata/md5-cache/net-p2p/gnut-0.4.28-r1
 1903272109 metadata/md5-cache/net-p2p/syncthing-1.1.0
 1903141632 metadata/md5-cache/net-p2p/bisq-0.6.3
-1903141632 metadata/md5-cache/sys-libs/libhx-3.16
 1903141632 metadata/md5-cache/sys-libs/mars-1.0.1
 1903251810 metadata/md5-cache/sys-libs/tevent-0.9.37
 1903212146 metadata/md5-cache/sys-libs/libcap-ng-0.7.9
@@ -37481,7 +37427,7 @@
 1903291609 metadata/md5-cache/sys-libs/pam-1.2.1-r2
 1904021639 metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
 1903212146 metadata/md5-cache/sys-libs/libomp-9999
-1903141632 metadata/md5-cache/sys-libs/libhx-3.24
+1904110139 metadata/md5-cache/sys-libs/libhx-3.24
 1903141632 metadata/md5-cache/sys-libs/gdbm-1.18.1
 1903212146 metadata/md5-cache/sys-libs/libselinux-2.9_rc1
 1903141632 metadata/md5-cache/sys-libs/readline-6.3_p8-r3
@@ -37498,7 +37444,7 @@
 1903141632 metadata/md5-cache/sys-libs/rpmatch-standalone-1.0
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1903311109 metadata/md5-cache/sys-libs/libosinfo-1.4.0
-1904081909 metadata/md5-cache/sys-libs/glibc-2.28-r6
+1904101809 metadata/md5-cache/sys-libs/glibc-2.28-r6
 1903141632 metadata/md5-cache/sys-libs/tapi-1.30
 1903212146 metadata/md5-cache/sys-libs/libcxx-6.0.1
 1903141632 metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r2
@@ -37543,7 +37489,7 @@
 1903311709 metadata/md5-cache/sys-libs/libsemanage-9999
 1903212146 metadata/md5-cache/sys-libs/libcxxabi-7.0.1
 1903141632 metadata/md5-cache/sys-libs/libhx-3.22-r1
-1904080539 metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
+1904110239 metadata/md5-cache/sys-libs/binutils-libs-2.31.1-r4
 1903141632 metadata/md5-cache/sys-libs/efivar-30
 1903291609 metadata/md5-cache/sys-libs/libcap-2.26-r2
 1903141632 metadata/md5-cache/sys-libs/db-18.1.25
@@ -37563,7 +37509,6 @@
 1903141632 metadata/md5-cache/sys-libs/binutils-libs-2.32
 1903141632 metadata/md5-cache/sys-libs/gpm-1.20.7-r2
 1903141632 metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
-1903141632 metadata/md5-cache/sys-libs/zlib-1.2.11-r1
 1903212146 metadata/md5-cache/sys-libs/libcxx-7.0.1
 1903141632 metadata/md5-cache/sys-libs/db-5.3.28-r2
 1903212146 metadata/md5-cache/sys-libs/libsemanage-2.9_rc1
@@ -37573,12 +37518,11 @@
 1903251810 metadata/md5-cache/sys-libs/ldb-1.6.3
 1903212146 metadata/md5-cache/sys-libs/compiler-rt-9999
 1903311709 metadata/md5-cache/sys-libs/libsepol-2.9
-1904100039 metadata/md5-cache/sys-libs/Manifest.gz
+1904120009 metadata/md5-cache/sys-libs/Manifest.gz
 1903141632 metadata/md5-cache/sys-libs/readline-8.0
 1903141632 metadata/md5-cache/sys-libs/readline-5.2_p14
 1704132239 metadata/md5-cache/sys-libs/csu-79
 1903212146 metadata/md5-cache/sys-libs/libsmbios-2.4.1
-1903141632 metadata/md5-cache/sys-libs/zlib-1.2.11
 1903260039 metadata/md5-cache/sys-libs/glibc-9999
 1903212146 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
 1903141632 metadata/md5-cache/sys-libs/csu-85
@@ -37601,6 +37545,7 @@
 1903141632 metadata/md5-cache/sys-libs/binutils-libs-2.27
 1903141632 metadata/md5-cache/sys-libs/gdbm-1.14.1
 1903141632 metadata/md5-cache/sys-libs/db-18.1.32
+1904102309 metadata/md5-cache/sys-libs/musl-1.1.22
 1903212146 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
 1903141632 metadata/md5-cache/sys-libs/binutils-libs-2.29.1-r1
 1903141632 metadata/md5-cache/sys-libs/newlib-2.2.0
@@ -37617,7 +37562,6 @@
 1903141632 metadata/md5-cache/sys-libs/libaal-1.0.7
 1903141632 metadata/md5-cache/sys-libs/timezone-data-2018i
 1901251639 metadata/md5-cache/sys-libs/freeipmi-1.6.3
-1903141632 metadata/md5-cache/sys-libs/libhx-3.22
 1804281409 metadata/md5-cache/sys-libs/rvm-1.17-r1
 1903251810 metadata/md5-cache/sys-libs/talloc-2.1.15
 1903251810 metadata/md5-cache/sys-libs/tdb-1.3.16
@@ -37704,7 +37648,6 @@
 1904091509 metadata/md5-cache/sys-libs/libblockdev-2.14-r1
 1903251810 metadata/md5-cache/sys-libs/tevent-0.9.39
 1903251810 metadata/md5-cache/sys-libs/tdb-1.3.18
-1903141632 metadata/md5-cache/sys-libs/glibc-2.21-r2
 1903141632 metadata/md5-cache/sys-libs/db-4.6.21_p4
 1904020009 metadata/md5-cache/sys-libs/kpmcore-3.3.0
 1903141632 metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -37720,7 +37663,7 @@
 1903212146 metadata/md5-cache/sci-visualization/mayavi-4.3.0
 1904020009 metadata/md5-cache/sci-visualization/labplot-2.5.0-r1
 1903141632 metadata/md5-cache/sci-visualization/opendx-4.4.4-r7
-1903141632 metadata/md5-cache/sci-visualization/gle-4.2.5-r1
+1904120009 metadata/md5-cache/sci-visualization/gle-4.2.5-r1
 1903212146 metadata/md5-cache/sci-visualization/fityk-1.2.9
 1903141632 metadata/md5-cache/sci-visualization/spyview-2018.12.24
 1904020009 metadata/md5-cache/sci-visualization/labplot-9999
@@ -37744,7 +37687,7 @@
 1903141632 metadata/md5-cache/sci-visualization/grace-5.1.25
 1903212146 metadata/md5-cache/sci-visualization/veusz-3.0.1
 1903141632 metadata/md5-cache/sci-visualization/xyscan-4.3.0
-1904051909 metadata/md5-cache/sci-visualization/Manifest.gz
+1904120009 metadata/md5-cache/sci-visualization/Manifest.gz
 1904021539 metadata/md5-cache/sci-visualization/gnuplot-5.2.5
 1903141632 metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
 1903141632 metadata/md5-cache/sci-visualization/gnuplot-5.2.2
@@ -38451,7 +38394,6 @@
 1903141632 metadata/md5-cache/dev-ruby/sshkit-1.17.0
 1903141632 metadata/md5-cache/dev-ruby/inflecto-0.0.2
 1903141632 metadata/md5-cache/dev-ruby/rdoc-6.1.1
-1903141632 metadata/md5-cache/dev-ruby/sexp_processor-4.10.1
 1903141632 metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r2
 1903141632 metadata/md5-cache/dev-ruby/zentest-4.11.1
 1903141632 metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
@@ -38488,14 +38430,13 @@
 1903141632 metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
 1903141632 metadata/md5-cache/dev-ruby/hitimes-1.2.6
 1903141632 metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3-r2
-1903141632 metadata/md5-cache/dev-ruby/ffi-1.9.22
 1903141632 metadata/md5-cache/dev-ruby/ox-2.8.2
 1903141632 metadata/md5-cache/dev-ruby/hocon-1.2.5
 1903141632 metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
 1903141632 metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
 1901311240 metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.7
 1903141632 metadata/md5-cache/dev-ruby/i18n-1.2.0
-1903141632 metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+1904112109 metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
 1903141632 metadata/md5-cache/dev-ruby/spreadsheet-1.2.2
 1903141632 metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -38508,7 +38449,6 @@
 1903141632 metadata/md5-cache/dev-ruby/gruff-0.7.0-r1
 1903141632 metadata/md5-cache/dev-ruby/barby-0.6.6
 1903141632 metadata/md5-cache/dev-ruby/ffi-1.9.25
-1903141632 metadata/md5-cache/dev-ruby/bson-4.3.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
 1903141632 metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
 1903141632 metadata/md5-cache/dev-ruby/capybara-3.12.0
@@ -38517,10 +38457,7 @@
 1903141632 metadata/md5-cache/dev-ruby/psych-3.0.3
 1903141632 metadata/md5-cache/dev-ruby/vcard-0.2.15
 1903141632 metadata/md5-cache/dev-ruby/net-ssh-5.1.0
-1903141632 metadata/md5-cache/dev-ruby/rack-cache-1.7.2
-1903141632 metadata/md5-cache/dev-ruby/thor-0.20.0
 1903141632 metadata/md5-cache/dev-ruby/kramdown-1.17.0
-1903141632 metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.134
 1903141632 metadata/md5-cache/dev-ruby/listen-0.7.3-r2
 1903141632 metadata/md5-cache/dev-ruby/curses-1.2.7
 1903141632 metadata/md5-cache/dev-ruby/mime-types-3.2.2
@@ -38537,7 +38474,6 @@
 1903141632 metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
 1903141632 metadata/md5-cache/dev-ruby/uglifier-3.2.0
 1903141632 metadata/md5-cache/dev-ruby/eventmachine-1.2.7
-1903141632 metadata/md5-cache/dev-ruby/slop-4.4.3
 1903141632 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
 1903141632 metadata/md5-cache/dev-ruby/crack-0.4.3-r2
 1903141632 metadata/md5-cache/dev-ruby/haml-rails-2.0.0
@@ -38545,14 +38481,11 @@
 1903141632 metadata/md5-cache/dev-ruby/fakefs-0.19.2
 1903141632 metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
 1903141632 metadata/md5-cache/dev-ruby/bindex-0.5.0
-1903141632 metadata/md5-cache/dev-ruby/faraday-0.14.0
 1903141632 metadata/md5-cache/dev-ruby/turbolinks-2.5.4
 1903141632 metadata/md5-cache/dev-ruby/dotenv-2.5.0
 1903141632 metadata/md5-cache/dev-ruby/rouge-1.11.1-r2
 1903141632 metadata/md5-cache/dev-ruby/exifr-1.3.5
-1903141632 metadata/md5-cache/dev-ruby/rake-compiler-1.0.5
 1903141632 metadata/md5-cache/dev-ruby/capybara-3.13.2
-1903141632 metadata/md5-cache/dev-ruby/rake-compiler-1.0.6
 1903141632 metadata/md5-cache/dev-ruby/ddplugin-1.0.1
 1903141632 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
 1903141632 metadata/md5-cache/dev-ruby/gherkin-5.1.0
@@ -38578,12 +38511,10 @@
 1903141632 metadata/md5-cache/dev-ruby/daemons-1.3.0
 1903141632 metadata/md5-cache/dev-ruby/mini_magick-4.9.3
 1903141632 metadata/md5-cache/dev-ruby/flickraw-0.9.10
-1903141632 metadata/md5-cache/dev-ruby/faraday-0.15.3
 1903141632 metadata/md5-cache/dev-ruby/exifr-1.3.4
 1903141632 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
 1903141632 metadata/md5-cache/dev-ruby/liquid-c-3.0.0
 1903141632 metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
-1903141632 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
 1903141632 metadata/md5-cache/dev-ruby/rainbow-3.0.0
 1903141632 metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.5
 1903141632 metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
@@ -38594,18 +38525,15 @@
 1903141632 metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
 1903141632 metadata/md5-cache/dev-ruby/bson-4.4.2
 1903141632 metadata/md5-cache/dev-ruby/rex-arch-0.1.13
-1903141632 metadata/md5-cache/dev-ruby/webrobots-0.1.2
 1903141632 metadata/md5-cache/dev-ruby/http-0.9.8-r2
 1903141632 metadata/md5-cache/dev-ruby/ascii85-1.0.3
 1903141632 metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5
 1903141632 metadata/md5-cache/dev-ruby/ruby-progressbar-1.9.0
-1903141632 metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1
 1903141632 metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
 1903141632 metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
 1903141632 metadata/md5-cache/dev-ruby/websocket-1.2.8
 1903141632 metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.6
 1903141632 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
-1903141632 metadata/md5-cache/dev-ruby/bson-4.4.1
 1903141632 metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
 1903141632 metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
 1903141632 metadata/md5-cache/dev-ruby/xdr-3.0.0
@@ -38627,7 +38555,6 @@
 1903141632 metadata/md5-cache/dev-ruby/flog-4.6.2
 1903141632 metadata/md5-cache/dev-ruby/patron-0.10.0
 1903141632 metadata/md5-cache/dev-ruby/hiera-eyaml-3.0.0
-1903141632 metadata/md5-cache/dev-ruby/listen-3.1.5-r2
 1903141632 metadata/md5-cache/dev-ruby/coffee-script-2.4.1
 1903141632 metadata/md5-cache/dev-ruby/cri-2.15.2
 1903141632 metadata/md5-cache/dev-ruby/simplecov-0.16.1-r1
@@ -38643,6 +38570,7 @@
 1903141632 metadata/md5-cache/dev-ruby/ruby-vte3-3.3.2
 1904010909 metadata/md5-cache/dev-ruby/bindex-0.6.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+1904112339 metadata/md5-cache/dev-ruby/facter-3.13.2
 1903141632 metadata/md5-cache/dev-ruby/rake-12.3.1
 1903141632 metadata/md5-cache/dev-ruby/selenium-webdriver-3.12.0
 1903141632 metadata/md5-cache/dev-ruby/yard-0.9.18
@@ -38661,7 +38589,7 @@
 1903141632 metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
 1903141632 metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
-1903301239 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.4
+1904112109 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.4
 1903141632 metadata/md5-cache/dev-ruby/bourne-1.6.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
 1903141632 metadata/md5-cache/dev-ruby/roadie-rails-1.2.1
@@ -38675,37 +38603,29 @@
 1903141632 metadata/md5-cache/dev-ruby/gpgme-2.0.12-r1
 1903141632 metadata/md5-cache/dev-ruby/ruby-gdk3-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/rr-1.2.1
-1903141632 metadata/md5-cache/dev-ruby/rouge-2.2.1
 1903141632 metadata/md5-cache/dev-ruby/climate_control-0.2.0
 1903141632 metadata/md5-cache/dev-ruby/compass-1.0.3-r1
 1903141632 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
 1903141632 metadata/md5-cache/dev-ruby/equalizer-0.0.11
-1903141632 metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.100
 1903141632 metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
 1903141632 metadata/md5-cache/dev-ruby/turbolinks-5.2.0
-1903141632 metadata/md5-cache/dev-ruby/capistrano-3.10.1
 1903141632 metadata/md5-cache/dev-ruby/bunny-2.14.1
 1903141632 metadata/md5-cache/dev-ruby/asciimath-1.0.8
 1903141632 metadata/md5-cache/dev-ruby/github_api-0.18.2
 1903141632 metadata/md5-cache/dev-ruby/rake-compiler-1.0.7
 1903141632 metadata/md5-cache/dev-ruby/uglifier-4.1.20
 1903141632 metadata/md5-cache/dev-ruby/twitter-text-1.14.7
-1903141632 metadata/md5-cache/dev-ruby/barby-0.6.5
 1903141632 metadata/md5-cache/dev-ruby/sshkit-1.18.0
 1903141632 metadata/md5-cache/dev-ruby/rack-protection-2.0.4
 1903141632 metadata/md5-cache/dev-ruby/mysql2-0.3.21
 1903141632 metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.12
 1903141632 metadata/md5-cache/dev-ruby/git-1.5.0
-1903141632 metadata/md5-cache/dev-ruby/rspec-rails-3.8.0
 1903141632 metadata/md5-cache/dev-ruby/arel-8.0.0
 1903241139 metadata/md5-cache/dev-ruby/power_assert-1.1.4
 1903141632 metadata/md5-cache/dev-ruby/rack-test-0.6.3
 1903291239 metadata/md5-cache/dev-ruby/fuubar-2.3.2
-1903141632 metadata/md5-cache/dev-ruby/sexp_processor-4.11.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.2
-1903141632 metadata/md5-cache/dev-ruby/dbf-4.1.1
 1903141632 metadata/md5-cache/dev-ruby/commander-4.4.6
-1903141632 metadata/md5-cache/dev-ruby/roadie-3.2.2
 1903141632 metadata/md5-cache/dev-ruby/minitest-5.10.3
 1903141632 metadata/md5-cache/dev-ruby/mysql2-0.5.1
 1903141632 metadata/md5-cache/dev-ruby/rex-random_identifier-0.1.4
@@ -38713,15 +38633,13 @@
 1903141632 metadata/md5-cache/dev-ruby/json-2.1.0
 1903141632 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
 1903291009 metadata/md5-cache/dev-ruby/activejob-5.1.7
-1903141632 metadata/md5-cache/dev-ruby/capistrano-3.10.2
-1903141632 metadata/md5-cache/dev-ruby/request_store-1.0.5
+1904102039 metadata/md5-cache/dev-ruby/request_store-1.0.5
 1903141632 metadata/md5-cache/dev-ruby/rainbow-2.2.2
 1903141632 metadata/md5-cache/dev-ruby/amq-protocol-2.3.0
 1903141632 metadata/md5-cache/dev-ruby/rspec-retry-0.6.1
 1903141632 metadata/md5-cache/dev-ruby/fivemat-1.3.7
-1903141632 metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
+1904111009 metadata/md5-cache/dev-ruby/mysql2-0.4.10-r1
 1903141632 metadata/md5-cache/dev-ruby/trollop-2.1.3
-1903141632 metadata/md5-cache/dev-ruby/aws-sdk-2.10.134
 1903141632 metadata/md5-cache/dev-ruby/certificate_authority-0.1.6-r2
 1903282309 metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
 1903141632 metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
@@ -38776,7 +38694,6 @@
 1903141632 metadata/md5-cache/dev-ruby/test-unit-3.2.9
 1903141632 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
 1903141632 metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
-1903141632 metadata/md5-cache/dev-ruby/rb-inotify-0.9.10-r1
 1903141632 metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.10.1
 1903141632 metadata/md5-cache/dev-ruby/parslet-1.8.2
 1903261909 metadata/md5-cache/dev-ruby/facter-3.13.1
@@ -38788,7 +38705,6 @@
 1903141632 metadata/md5-cache/dev-ruby/daemons-1.3.1
 1903141632 metadata/md5-cache/dev-ruby/acts_as_list-0.9.18
 1903141632 metadata/md5-cache/dev-ruby/commander-4.4.7
-1903141632 metadata/md5-cache/dev-ruby/aws-sdk-2.10.100
 1903241139 metadata/md5-cache/dev-ruby/c21e-1.1.9
 1903141632 metadata/md5-cache/dev-ruby/memoist-0.15.0
 1903141632 metadata/md5-cache/dev-ruby/selenium-webdriver-3.13.1
@@ -38806,8 +38722,6 @@
 1903141632 metadata/md5-cache/dev-ruby/bunny-2.9.2
 1903141632 metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
 1903141632 metadata/md5-cache/dev-ruby/rbnacl-6.0.0
-1903141632 metadata/md5-cache/dev-ruby/rouge-2.2.0
-1903141632 metadata/md5-cache/dev-ruby/typhoeus-0.6.9
 1903141632 metadata/md5-cache/dev-ruby/thread_safe-0.3.6
 1903141632 metadata/md5-cache/dev-ruby/metasm-1.0.2-r4
 1903291009 metadata/md5-cache/dev-ruby/actioncable-5.1.7
@@ -38825,7 +38739,7 @@
 1903141632 metadata/md5-cache/dev-ruby/safe_yaml-1.0.5
 1903141632 metadata/md5-cache/dev-ruby/actionview-4.2.11.1
 1903141632 metadata/md5-cache/dev-ruby/ox-2.9.4
-1903141632 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
+1904111009 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6-r1
 1904060909 metadata/md5-cache/dev-ruby/backports-3.12.0
 1903141632 metadata/md5-cache/dev-ruby/activesupport-4.2.11.1
 1903141632 metadata/md5-cache/dev-ruby/posix-spawn-0.3.13
@@ -38894,7 +38808,6 @@
 1903141632 metadata/md5-cache/dev-ruby/git-1.4.0
 1903141632 metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
 1903141632 metadata/md5-cache/dev-ruby/ddmetrics-1.0.0
-1903141632 metadata/md5-cache/dev-ruby/archive-tar-minitar-0.7
 1903141632 metadata/md5-cache/dev-ruby/little-plugger-1.1.4
 1903250909 metadata/md5-cache/dev-ruby/parallel-1.15.0
 1903141632 metadata/md5-cache/dev-ruby/sass-listen-4.0.0
@@ -38907,7 +38820,7 @@
 1903141632 metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
 1903141632 metadata/md5-cache/dev-ruby/paint-2.0.1
 1903141632 metadata/md5-cache/dev-ruby/ruby-gio2-3.3.2
-1903141632 metadata/md5-cache/dev-ruby/thor-0.20.3
+1904112109 metadata/md5-cache/dev-ruby/thor-0.20.3
 1903141632 metadata/md5-cache/dev-ruby/puppet_forge-2.2.9-r1
 1903141632 metadata/md5-cache/dev-ruby/ruby-clutter-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/celluloid-io-0.17.3
@@ -38939,7 +38852,6 @@
 1903141632 metadata/md5-cache/dev-ruby/ruby_smb-1.0.5
 1903141632 metadata/md5-cache/dev-ruby/sass-3.4.25-r1
 1903141632 metadata/md5-cache/dev-ruby/bundler-1.16.6
-1903141632 metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.2
 1903141632 metadata/md5-cache/dev-ruby/crack-0.4.3-r1
 1903141632 metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/slim-4.0.1
@@ -38951,16 +38863,14 @@
 1903141632 metadata/md5-cache/dev-ruby/i18n-0.8.6
 1903141632 metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
 1903141632 metadata/md5-cache/dev-ruby/ruby-oembed-0.12.0
-1903141632 metadata/md5-cache/dev-ruby/ruby-oci8-2.2.4.1
 1903141632 metadata/md5-cache/dev-ruby/timecop-0.9.1
-1903141632 metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
+1904111009 metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
 1903141632 metadata/md5-cache/dev-ruby/rubyzip-1.2.2
 1903141632 metadata/md5-cache/dev-ruby/bundler-1.16.1
 1903141632 metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
 1903141632 metadata/md5-cache/dev-ruby/erubi-1.7.0
 1903311109 metadata/md5-cache/dev-ruby/parallel-1.16.2
 1903141632 metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
-1903141632 metadata/md5-cache/dev-ruby/aws-sdk-resources-2.10.100
 1903141632 metadata/md5-cache/dev-ruby/docile-1.3.1
 1904020739 metadata/md5-cache/dev-ruby/yard-0.9.19
 1903141632 metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
@@ -39001,7 +38911,6 @@
 1903141632 metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.14
 1903141632 metadata/md5-cache/dev-ruby/gherkin-4.1.3
 1904070939 metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.0
-1903141632 metadata/md5-cache/dev-ruby/ffi-1.9.21
 1903141632 metadata/md5-cache/dev-ruby/bindata-2.4.1
 1903302309 metadata/md5-cache/dev-ruby/thread_order-1.1.0
 1903141632 metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -39012,7 +38921,7 @@
 1903141632 metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.4
 1903141632 metadata/md5-cache/dev-ruby/letter_opener-1.6.0
 1903141632 metadata/md5-cache/dev-ruby/uglifier-4.1.19
-1903141632 metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
+1904102039 metadata/md5-cache/dev-ruby/ruby-oci8-2.2.5.1
 1903141632 metadata/md5-cache/dev-ruby/msgpack-1.2.7
 1903141632 metadata/md5-cache/dev-ruby/coolio-1.5.3
 1903141632 metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
@@ -39034,7 +38943,6 @@
 1903141632 metadata/md5-cache/dev-ruby/mime-types-2.99.2
 1903141632 metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/nokogumbo-2.0.1
-1903141632 metadata/md5-cache/dev-ruby/ruby_parser-3.10.1
 1903141632 metadata/md5-cache/dev-ruby/amqp-1.8.0
 1903141632 metadata/md5-cache/dev-ruby/arel-helpers-2.8.0
 1903141632 metadata/md5-cache/dev-ruby/json_schema-0.20.2
@@ -39078,15 +38986,14 @@
 1903141632 metadata/md5-cache/dev-ruby/faraday-0.15.4
 1903141632 metadata/md5-cache/dev-ruby/ice_nine-0.11.2
 1903141632 metadata/md5-cache/dev-ruby/curses-1.2.6
-1903141632 metadata/md5-cache/dev-ruby/activeldap-5.2.2
 1903141632 metadata/md5-cache/dev-ruby/inifile-3.0.0
 1903141632 metadata/md5-cache/dev-ruby/rdoc-6.1.0
+1904111009 metadata/md5-cache/dev-ruby/test-unit-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/ref-2.0.0
 1903282239 metadata/md5-cache/dev-ruby/railties-5.2.3
 1903141632 metadata/md5-cache/dev-ruby/rubyntlm-0.6.2
 1903141632 metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
 1903141632 metadata/md5-cache/dev-ruby/ecma-re-validator-0.1.2
-1903141632 metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.4
 1903141632 metadata/md5-cache/dev-ruby/qed-2.9.2
 1903141632 metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
 1903141632 metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.2
@@ -39096,10 +39003,9 @@
 1903141632 metadata/md5-cache/dev-ruby/best_in_place-3.1.1
 1903141632 metadata/md5-cache/dev-ruby/fast_gettext-1.7.0
 1903141632 metadata/md5-cache/dev-ruby/sigar-0.7.3
-1903141632 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
+1904112109 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 1903141632 metadata/md5-cache/dev-ruby/astrolabe-1.3.1
 1903141632 metadata/md5-cache/dev-ruby/fakeweb-1.3.0.20170806
-1903141632 metadata/md5-cache/dev-ruby/fakefs-0.18.1
 1903301239 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
 1903141632 metadata/md5-cache/dev-ruby/dotenv-2.7.1
 1903141632 metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
@@ -39114,7 +39020,7 @@
 1903141632 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
 1903141632 metadata/md5-cache/dev-ruby/hashdiff-0.3.8
 1903141632 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1904100939 metadata/md5-cache/dev-ruby/Manifest.gz
+1904112339 metadata/md5-cache/dev-ruby/Manifest.gz
 1903141632 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1903141632 metadata/md5-cache/dev-ruby/sprockets-3.7.2
 1903141632 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -39126,9 +39032,9 @@
 1903141632 metadata/md5-cache/dev-ruby/niceogiri-1.1.2
 1903141632 metadata/md5-cache/dev-ruby/ethon-0.12.0
 1903141632 metadata/md5-cache/dev-ruby/rqrcode-0.10.1
-1903141632 metadata/md5-cache/dev-ruby/listen-3.1.5-r3
+1904111009 metadata/md5-cache/dev-ruby/listen-3.1.5-r3
 1903282309 metadata/md5-cache/dev-ruby/rspec-mocks-3.7.0
-1903141632 metadata/md5-cache/dev-ruby/vcr-4.0.0
+1904112109 metadata/md5-cache/dev-ruby/vcr-4.0.0
 1903141632 metadata/md5-cache/dev-ruby/parser-2.5.3.0
 1903141632 metadata/md5-cache/dev-ruby/d3_rails-4.1.1
 1903141632 metadata/md5-cache/dev-ruby/railties-5.2.2.1
@@ -39142,7 +39048,6 @@
 1903141632 metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.2
 1904060939 metadata/md5-cache/dev-ruby/sass-3.7.4
 1903141632 metadata/md5-cache/dev-ruby/fast_gettext-2.0.0
-1903141632 metadata/md5-cache/dev-ruby/ruby_parser-3.11.0
 1903141632 metadata/md5-cache/dev-ruby/cri-2.15.1
 1903141632 metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
 1903141632 metadata/md5-cache/dev-ruby/actionview-5.2.2.1
@@ -39163,7 +39068,6 @@
 1903141632 metadata/md5-cache/dev-ruby/maxitest-2.8.0
 1903141632 metadata/md5-cache/dev-ruby/marcel-0.3.3
 1903141632 metadata/md5-cache/dev-ruby/kramdown-1.16.2
-1903141632 metadata/md5-cache/dev-ruby/bson-4.2.2
 1903141632 metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1
 1903141632 metadata/md5-cache/dev-ruby/mustermann-1.0.3
 1903141632 metadata/md5-cache/dev-ruby/rmagick-3.0.0
@@ -39173,7 +39077,6 @@
 1903141632 metadata/md5-cache/dev-ruby/request_store-1.4.1
 1903141632 metadata/md5-cache/dev-ruby/jmespath-1.4.0
 1903141632 metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
-1903141632 metadata/md5-cache/dev-ruby/rspec-rails-3.8.1
 1903141632 metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
 1903162309 metadata/md5-cache/dev-ruby/diff-lcs-1.3
 1903141632 metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
@@ -39189,7 +39092,6 @@
 1903151039 metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
 1903141632 metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
 1903141632 metadata/md5-cache/dev-ruby/bundler-audit-0.6.1
-1903141632 metadata/md5-cache/dev-ruby/typhoeus-1.3.0
 1903301009 metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
 1903141632 metadata/md5-cache/dev-ruby/rex-nop-0.1.1
 1903141632 metadata/md5-cache/dev-ruby/paint-2.0.3
@@ -39215,7 +39117,6 @@
 1903141632 metadata/md5-cache/dev-ruby/rack-test-0.8.3-r1
 1903141632 metadata/md5-cache/dev-ruby/liquid-2.6.2
 1903141632 metadata/md5-cache/dev-ruby/rex-java-0.1.5
-1903141632 metadata/md5-cache/dev-ruby/bindata-2.4.0
 1903141632 metadata/md5-cache/dev-ruby/bogus-0.1.6
 1903141632 metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
 1903141632 metadata/md5-cache/dev-ruby/hoe-3.16.0
@@ -39239,7 +39140,6 @@
 1903141632 metadata/md5-cache/dev-ruby/tins-1.20.2
 1903141632 metadata/md5-cache/dev-ruby/allison-2.0.3-r3
 1903141632 metadata/md5-cache/dev-ruby/jquery-rails-4.3.1-r1
-1903141632 metadata/md5-cache/dev-ruby/elasticsearch-5.0.4
 1903141632 metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
 1903141632 metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
 1903241139 metadata/md5-cache/dev-ruby/capybara-3.15.0
@@ -39283,10 +39183,8 @@
 1903141632 metadata/md5-cache/dev-ruby/paint-2.1.0
 1903141632 metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
 1903141632 metadata/md5-cache/dev-ruby/notify-0.5.2-r1
-1903141632 metadata/md5-cache/dev-ruby/fakefs-0.19.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.2
 1903141632 metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
-1903141632 metadata/md5-cache/dev-ruby/aws-sdk-core-2.10.134
 1903141632 metadata/md5-cache/dev-ruby/rex-mime-0.1.5
 1903141632 metadata/md5-cache/dev-ruby/actionpack-5.2.2.1
 1903141632 metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -39388,19 +39286,18 @@
 1903141632 metadata/md5-cache/dev-ruby/web-console-3.7.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
 1903141632 metadata/md5-cache/dev-ruby/typhoeus-1.3.1
-1903141632 metadata/md5-cache/dev-ruby/rack-cache-1.9.0
+1904112109 metadata/md5-cache/dev-ruby/rack-cache-1.9.0
 1903141632 metadata/md5-cache/dev-ruby/semver2-3.4.2
 1903141632 metadata/md5-cache/dev-ruby/serialport-1.3.1
 1903141632 metadata/md5-cache/dev-ruby/kissfft-0.0.2
 1903141632 metadata/md5-cache/dev-ruby/websocket-driver-0.6.5
 1903141632 metadata/md5-cache/dev-ruby/activesupport-5.2.2.1
-1903141632 metadata/md5-cache/dev-ruby/dbf-3.1.3
 1903141632 metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
-1903141632 metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
 1903282309 metadata/md5-cache/dev-ruby/rspec-core-3.7.1
 1903141632 metadata/md5-cache/dev-ruby/addressable-2.6.0
 1903141632 metadata/md5-cache/dev-ruby/cliver-0.3.2
 1903141632 metadata/md5-cache/dev-ruby/recog-2.1.6-r1
+1904111009 metadata/md5-cache/dev-ruby/rex-powershell-0.1.80
 1903141632 metadata/md5-cache/dev-ruby/d3_rails-3.5.17
 1903141632 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
 1903141632 metadata/md5-cache/dev-ruby/rex-socket-0.1.15
@@ -39414,7 +39311,6 @@
 1903141632 metadata/md5-cache/dev-ruby/http-form_data-1.0.3
 1903141632 metadata/md5-cache/dev-ruby/pusher-client-0.6.2
 1903141632 metadata/md5-cache/dev-ruby/actionmailer-5.2.2.1
-1903141632 metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
 1903141632 metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.5
 1903271009 metadata/md5-cache/dev-ruby/dotenv-2.7.2
 1903250939 metadata/md5-cache/dev-ruby/actionpack-5.1.6.2
@@ -39428,7 +39324,6 @@
 1903141632 metadata/md5-cache/dev-ruby/postgres_ext-3.0.1
 1903141632 metadata/md5-cache/dev-ruby/tins-1.14.0
 1903141632 metadata/md5-cache/dev-ruby/metaclass-0.0.4
-1903141632 metadata/md5-cache/dev-ruby/rack-cache-1.7.1
 1903302309 metadata/md5-cache/dev-ruby/nokogiri-1.9.1
 1903141632 metadata/md5-cache/dev-ruby/sprockets-3.7.1
 1903162309 metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
@@ -39453,7 +39348,6 @@
 1903141632 metadata/md5-cache/dev-ruby/ruby_parser-3.13.0
 1903141632 metadata/md5-cache/dev-ruby/text-1.3.1
 1903141632 metadata/md5-cache/dev-ruby/mail-2.6.6
-1903202209 metadata/md5-cache/dev-ruby/multi_json-1.12.2
 1903141632 metadata/md5-cache/dev-ruby/termcolor-1.2.2
 1903282239 metadata/md5-cache/dev-ruby/activemodel-5.2.3
 1903141632 metadata/md5-cache/dev-ruby/tzinfo-2.0.0
@@ -39469,11 +39363,10 @@
 1903141632 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
 1903141632 metadata/md5-cache/dev-ruby/liquid-c-4.0.0
 1903141632 metadata/md5-cache/dev-ruby/rex-sslscan-0.1.5
-1903141632 metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
+1904112109 metadata/md5-cache/dev-ruby/webrobots-0.1.2-r1
 1903141632 metadata/md5-cache/dev-ruby/test_declarative-0.0.6
 1903141632 metadata/md5-cache/dev-ruby/curb-0.9.8
 1903141632 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
-1903141632 metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.3
 1903141632 metadata/md5-cache/dev-ruby/fakefs-0.11.3
 1904100939 metadata/md5-cache/dev-ruby/http-4.1.1
 1903250939 metadata/md5-cache/dev-ruby/actionview-5.1.6.2
@@ -39496,14 +39389,11 @@
 1903141632 metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
 1903141632 metadata/md5-cache/dev-ruby/i18n-1.0.1-r1
 1903141632 metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
-1903141632 metadata/md5-cache/dev-ruby/ffi-1.9.23
 1903141632 metadata/md5-cache/dev-ruby/colorize-0.8.1
 1903141632 metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
 1903141632 metadata/md5-cache/dev-ruby/autoprefixer-rails-8.6.5
 1903141632 metadata/md5-cache/dev-ruby/activerecord-5.1.6.2
 1903141632 metadata/md5-cache/dev-ruby/xml-simple-1.1.5
-1903141632 metadata/md5-cache/dev-ruby/elasticsearch-api-5.0.4
-1903202209 metadata/md5-cache/dev-ruby/multi_json-1.13.0
 1903141632 metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
 1903141632 metadata/md5-cache/dev-ruby/robots-0.10.1-r2
 1903141632 metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
@@ -39511,7 +39401,7 @@
 1903141632 metadata/md5-cache/dev-ruby/mocha-1.8.0
 1903141632 metadata/md5-cache/dev-ruby/tomlrb-1.2.8
 1903141632 metadata/md5-cache/dev-ruby/curses-1.2.5
-1903141632 metadata/md5-cache/dev-ruby/rack-test-1.0.0
+1904102039 metadata/md5-cache/dev-ruby/rack-test-1.0.0
 1903282239 metadata/md5-cache/dev-ruby/activerecord-5.2.3
 1903141632 metadata/md5-cache/dev-ruby/i18n-1.5.2
 1903141632 metadata/md5-cache/dev-ruby/sinatra-2.0.4
@@ -39537,7 +39427,6 @@
 1903141632 metadata/md5-cache/dev-ruby/ttfunk-1.5.1
 1904030909 metadata/md5-cache/dev-ruby/rack-2.0.7
 1903141632 metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
-1903141632 metadata/md5-cache/dev-ruby/roadie-3.3.0
 1903141632 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.6
 1904070939 metadata/md5-cache/dev-ruby/backports-3.13.0
 1903141632 metadata/md5-cache/dev-ruby/sfl-2.2-r1
@@ -39556,14 +39445,13 @@
 1903141632 metadata/md5-cache/dev-ruby/recog-2.1.31
 1903141632 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
 1903141632 metadata/md5-cache/dev-ruby/celluloid-0.17.3
-1903141632 metadata/md5-cache/dev-ruby/factory_girl-4.8.1
+1904112139 metadata/md5-cache/dev-ruby/factory_girl-4.8.1
 1903141632 metadata/md5-cache/dev-ruby/asciidoctor-1.5.8
 1903141632 metadata/md5-cache/dev-ruby/hiera-eyaml-2.1.0-r2
 1903141632 metadata/md5-cache/dev-ruby/gh-0.15.1-r1
 1903302309 metadata/md5-cache/dev-ruby/nokogiri-1.8.1
 1903141632 metadata/md5-cache/dev-ruby/database_cleaner-1.6.2-r1
 1903141632 metadata/md5-cache/dev-ruby/asciimath-1.0.4
-1903141632 metadata/md5-cache/dev-ruby/ruby_parser-3.12.0
 1904071139 metadata/md5-cache/dev-ruby/zeitwerk-1.4.3
 1903141632 metadata/md5-cache/dev-ruby/liquid-4.0.2
 1903141632 metadata/md5-cache/dev-ruby/rdoc-6.0.4
@@ -39575,10 +39463,10 @@
 1903141632 metadata/md5-cache/dev-ruby/redis-3.3.5
 1903231539 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.1
 1903141632 metadata/md5-cache/dev-ruby/net-ssh-4.2.0
-1903141632 metadata/md5-cache/dev-ruby/psych-2.2.4
 1903141632 metadata/md5-cache/dev-ruby/erubi-1.8.0
 1903141632 metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
 1903141632 metadata/md5-cache/dev-ruby/webmock-3.4.1
+1904102039 metadata/md5-cache/dev-ruby/rouge-3.3.0
 1904060939 metadata/md5-cache/dev-ruby/pkg-config-1.3.7
 1903141632 metadata/md5-cache/dev-ruby/parallel-1.14.0
 1903141632 metadata/md5-cache/dev-ruby/travis-1.8.8
@@ -39586,7 +39474,6 @@
 1903141632 metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
 1903141632 metadata/md5-cache/dev-ruby/openvas-omp-0.0.4
 1903141632 metadata/md5-cache/dev-ruby/pkg-config-1.3.4
-1903141632 metadata/md5-cache/dev-ruby/aws-sigv4-1.0.2
 1903141632 metadata/md5-cache/dev-ruby/combustion-1.0.0
 1903151039 metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
 1903141632 metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -39621,7 +39508,6 @@
 1903141632 metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
 1903141632 metadata/md5-cache/dev-ruby/asciimath-1.0.7
 1903141632 metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
-1903141632 metadata/md5-cache/dev-ruby/rouge-1.11.1-r1
 1903141632 metadata/md5-cache/dev-ruby/letter_opener-1.7.0
 1903141632 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
 1903141632 metadata/md5-cache/dev-ruby/file-tail-1.2.0
@@ -39643,6 +39529,7 @@
 1903141632 metadata/md5-cache/dev-ruby/method_source-0.9.1
 1903141632 metadata/md5-cache/dev-ruby/mini_mime-1.0.0
 1903141632 metadata/md5-cache/dev-ruby/activeldap-4.0.6
+1904102039 metadata/md5-cache/dev-ruby/ruby-oci8-2.2.7
 1903141632 metadata/md5-cache/dev-ruby/mini_mime-1.0.1
 1903141632 metadata/md5-cache/dev-ruby/jwt-1.5.6
 1903141632 metadata/md5-cache/dev-ruby/hoe-3.17.2
@@ -39656,7 +39543,6 @@
 1903141632 metadata/md5-cache/dev-ruby/strptime-0.2.3
 1903141632 metadata/md5-cache/dev-ruby/mini_magick-4.8.0
 1904090909 metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
-1903141632 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
 1903141632 metadata/md5-cache/dev-ruby/mocha-0.14.0
 1903141632 metadata/md5-cache/dev-ruby/syslogger-1.6.5
 1903141632 metadata/md5-cache/dev-ruby/hitimes-1.3.1
@@ -39945,6 +39831,7 @@
 1903150339 metadata/md5-cache/media-video/v4l2loopback-0.12.0
 1903212146 metadata/md5-cache/www-client/weboob-1.3
 1903212146 metadata/md5-cache/www-client/elinks-9999
+1904110439 metadata/md5-cache/www-client/google-chrome-73.0.3683.103
 1904090939 metadata/md5-cache/www-client/opera-developer-61.0.3282.0
 1903141632 metadata/md5-cache/www-client/netsurf-3.8-r2
 1903141632 metadata/md5-cache/www-client/uget-2.2.1
@@ -39968,8 +39855,7 @@
 1903212146 metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
 1903141632 metadata/md5-cache/www-client/firefox-bin-52.9.0
 1903141632 metadata/md5-cache/www-client/surfraw-99999
-1903210309 metadata/md5-cache/www-client/google-chrome-73.0.3683.86
-1904052239 metadata/md5-cache/www-client/firefox-60.6.1
+1904120009 metadata/md5-cache/www-client/firefox-60.6.1
 1903141632 metadata/md5-cache/www-client/links-2.16
 1903212146 metadata/md5-cache/www-client/pybugz-0.13
 1903141632 metadata/md5-cache/www-client/w3m-0.5.3_p20190105
@@ -39985,7 +39871,7 @@
 1903141632 metadata/md5-cache/www-client/surfraw-2.2.9-r1
 1903280239 metadata/md5-cache/www-client/firefox-bin-66.0.2
 1903141632 metadata/md5-cache/www-client/jd-2.8.9_p150226
-1904100109 metadata/md5-cache/www-client/Manifest.gz
+1904120009 metadata/md5-cache/www-client/Manifest.gz
 1903141632 metadata/md5-cache/www-client/opera-12.16_p1860-r1
 1903162209 metadata/md5-cache/www-client/lynx-2.8.9_pre16
 1903141632 metadata/md5-cache/www-client/uget-2.2.0
@@ -39994,13 +39880,14 @@
 1903141632 metadata/md5-cache/www-client/otter-0.9.99.3
 1903212146 metadata/md5-cache/www-client/pybugz-9999
 1903141632 metadata/md5-cache/www-client/elinks-0.12_pre6-r1
+1904111909 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
 1903141632 metadata/md5-cache/www-client/phantomjs-2.1.1
 1903212146 metadata/md5-cache/www-client/qutebrowser-1.6.0
 1903212146 metadata/md5-cache/www-client/weboob-9999
 1904031909 metadata/md5-cache/www-client/vivaldi-snapshot-2.5.1504.6_p1
+1904110439 metadata/md5-cache/www-client/google-chrome-unstable-75.0.3759.4
 1903231409 metadata/md5-cache/www-client/firefox-bin-60.6.1
 1903141632 metadata/md5-cache/www-client/jd-2.8.5_p120826
-1903301639 metadata/md5-cache/www-client/google-chrome-unstable-75.0.3745.4
 1903141632 metadata/md5-cache/www-client/httrack-3.49.2-r1
 1812131039 metadata/md5-cache/www-client/lynx-2.8.9_p1
 1903281739 metadata/md5-cache/www-client/opera-beta-60.0.3255.15
@@ -40018,7 +39905,7 @@
 1904030239 metadata/md5-cache/www-client/opera-developer-61.0.3275.0
 1903141632 metadata/md5-cache/www-client/w3m-0.5.3_p20180125
 1903212146 metadata/md5-cache/www-client/epiphany-3.30.2
-1903281339 metadata/md5-cache/www-client/firefox-66.0.2
+1904102039 metadata/md5-cache/www-client/firefox-66.0.3
 1903141632 metadata/md5-cache/www-client/phantomjs-2.1.1-r1
 1903212146 metadata/md5-cache/www-client/chromium-73.0.3683.75
 1904050439 metadata/md5-cache/www-client/vivaldi-2.4.1488.36_p1
@@ -40026,7 +39913,7 @@
 1903141632 metadata/md5-cache/www-client/surf-2.0
 1903212146 metadata/md5-cache/www-client/firefox-52.9.0
 1903212146 metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
-1903301639 metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.40
+1904110439 metadata/md5-cache/www-client/google-chrome-beta-74.0.3729.75
 1808151104 metadata/md5-cache/app-emacs/windows-2.49
 1808190259 metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
 1903141632 metadata/md5-cache/app-emacs/python-mode-6.1.2
@@ -40353,7 +40240,6 @@
 1903212146 metadata/md5-cache/sys-devel/gdb-7.12.1
 1903141632 metadata/md5-cache/sys-devel/gcc-4.6.4
 1903141632 metadata/md5-cache/sys-devel/gcc-4.7.4-r1
-1903212146 metadata/md5-cache/sys-devel/distcc-3.3
 1903141632 metadata/md5-cache/sys-devel/gcc-4.7.4-r2
 1809180947 metadata/md5-cache/sys-devel/llvm-common-9999
 1903212146 metadata/md5-cache/sys-devel/automake-9999
@@ -40461,10 +40347,10 @@
 1903141632 metadata/md5-cache/sys-devel/gnuconfig-99999999
 1903141632 metadata/md5-cache/sys-devel/gnuconfig-20180101
 1903141632 metadata/md5-cache/sys-devel/gdb-apple-1752
-1904081209 metadata/md5-cache/sys-devel/patch-2.7.6-r3
+1904111309 metadata/md5-cache/sys-devel/patch-2.7.6-r3
 1812272209 metadata/md5-cache/sys-devel/autoconf-archive-2018.03.13
 1903141632 metadata/md5-cache/sys-devel/kgcc64-4.9.4
-1904091739 metadata/md5-cache/sys-devel/Manifest.gz
+1904111439 metadata/md5-cache/sys-devel/Manifest.gz
 1903141632 metadata/md5-cache/sys-devel/gcc-config-1.9.1
 1903141632 metadata/md5-cache/sys-devel/gcc-7.4.0
 1903141632 metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -40485,11 +40371,9 @@
 1903141632 metadata/md5-cache/sys-devel/binutils-2.30-r4
 1903212146 metadata/md5-cache/sys-devel/clang-7.0.9999
 1903270039 metadata/md5-cache/sys-devel/binutils-hppa64-2.31.1-r4
-1903212146 metadata/md5-cache/sys-devel/distcc-3.2_rc1-r5
 1812201609 metadata/md5-cache/sys-devel/llvm-common-7.0.1
 1903141632 metadata/md5-cache/sys-devel/autogen-5.18.16-r1
 1903212146 metadata/md5-cache/sys-devel/clang-6.0.1
-1903141632 metadata/md5-cache/sys-devel/patch-2.7.6-r2
 1903141632 metadata/md5-cache/sys-devel/gcc-4.1.2-r1
 1903141632 metadata/md5-cache/sys-devel/automake-1.5-r2
 1806281809 metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328
@@ -40517,7 +40401,6 @@
 1903141632 metadata/md5-cache/sys-devel/binutils-hppa64-2.29.1
 1903141632 metadata/md5-cache/sys-devel/bmake-20170421
 1903141632 metadata/md5-cache/sys-devel/kgcc64-6.3.0
-1903212146 metadata/md5-cache/sys-devel/distcc-3.3.2-r4
 1902251540 metadata/md5-cache/sys-devel/icecream-1.0.0-r2
 1903212146 metadata/md5-cache/sys-devel/llvm-6.0.1
 1903141632 metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -40529,7 +40412,7 @@
 1903141632 metadata/md5-cache/sys-devel/automake-1.8.5-r5
 1903141632 metadata/md5-cache/sys-devel/kgcc64-4.2.4
 1903141632 metadata/md5-cache/sys-devel/gcc-6.4.0-r1
-1903141632 metadata/md5-cache/sys-devel/binutils-9999
+1904111439 metadata/md5-cache/sys-devel/binutils-9999
 1806190539 metadata/md5-cache/sys-devel/binutils-config-5.1-r1
 1812222209 metadata/md5-cache/sys-devel/autoconf-2.13-r1
 1903141632 metadata/md5-cache/sys-devel/sparse-9999
@@ -40538,7 +40421,7 @@
 1809180947 metadata/md5-cache/sys-devel/llvm-common-7.0.9999
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1903141632 metadata/md5-cache/sys-devel/autogen-5.18.12
-1904080539 metadata/md5-cache/sys-devel/binutils-2.31.1-r4
+1904110239 metadata/md5-cache/sys-devel/binutils-2.31.1-r4
 1904081009 metadata/md5-cache/sys-devel/distcc-3.3.2-r5
 1901170209 metadata/md5-cache/sys-devel/crossdev-20181020
 1809180947 metadata/md5-cache/sys-devel/autoconf-9999
@@ -40752,6 +40635,7 @@
 1903141632 metadata/md5-cache/app-crypt/libu2f-server-1.0.1
 1903141632 metadata/md5-cache/app-crypt/nwipe-0.21
 1809182339 metadata/md5-cache/app-crypt/hashcat-utils-1.9
+1904102209 metadata/md5-cache/app-crypt/signing-party-2.9
 1903141632 metadata/md5-cache/app-crypt/monkeysphere-0.41
 1810201839 metadata/md5-cache/app-crypt/acme-sh-2.7.9
 1903141632 metadata/md5-cache/app-crypt/signing-party-2.7
@@ -40858,7 +40742,7 @@
 1903141632 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1903141632 metadata/md5-cache/app-crypt/onak-0.5.0
 1903141632 metadata/md5-cache/app-crypt/jitterentropy-2.1.1
-1904100909 metadata/md5-cache/app-crypt/Manifest.gz
+1904102209 metadata/md5-cache/app-crypt/Manifest.gz
 1901311240 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1903141632 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1904070139 metadata/md5-cache/app-crypt/acme-0.33.1
@@ -41207,6 +41091,7 @@
 1808310240 metadata/md5-cache/virtual/perl-version-0.992.300
 1806142239 metadata/md5-cache/virtual/perl-Time-HiRes-1.974.100-r2
 1703291908 metadata/md5-cache/virtual/leechcraft-task-show-9999
+1904112039 metadata/md5-cache/virtual/jpeg-0-r3
 1903311639 metadata/md5-cache/virtual/python-pathlib-1.0
 1804270939 metadata/md5-cache/virtual/pypy-6.0.0
 1808310240 metadata/md5-cache/virtual/perl-libnet-3.80.100_rc-r4
@@ -41214,13 +41099,12 @@
 1702282334 metadata/md5-cache/virtual/emacs-flim-0
 1903141632 metadata/md5-cache/virtual/glu-9.0-r2
 1807220339 metadata/md5-cache/virtual/emacs-25
-1904090909 metadata/md5-cache/virtual/Manifest.gz
+1904112039 metadata/md5-cache/virtual/Manifest.gz
 1801231609 metadata/md5-cache/virtual/httpd-basic-0-r2
 1706261608 metadata/md5-cache/virtual/lapack-3.7
 1902161209 metadata/md5-cache/virtual/perl-HTTP-Tiny-0.70.0-r1
 1903212146 metadata/md5-cache/virtual/python-typing-0-r1
 1703291908 metadata/md5-cache/virtual/leechcraft-downloader-http-9999
-1903141632 metadata/md5-cache/virtual/jpeg-0-r2
 1704021908 metadata/md5-cache/virtual/linux-sources-3
 1811221539 metadata/md5-cache/virtual/perl-Math-BigInt-1.999.715-r2
 1901191439 metadata/md5-cache/virtual/perl-threads-2.220.0
@@ -41375,7 +41259,7 @@
 1806081509 metadata/md5-cache/virtual/perl-Exporter-5.720.0-r3
 1808310240 metadata/md5-cache/virtual/perl-Digest-SHA-5.950.100_rc-r6
 1902161209 metadata/md5-cache/virtual/perl-IO-Compress-2.74.0-r1
-1904082209 metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
+1904110109 metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0-r1
 1704241738 metadata/md5-cache/virtual/gnustep-back-0.25.1
 1902161209 metadata/md5-cache/virtual/perl-Math-BigInt-1.999.806-r1
 1807101039 metadata/md5-cache/virtual/perl-IO-1.390.0
@@ -41481,7 +41365,7 @@
 1903141632 metadata/md5-cache/net-irc/emech-3.0.99_p3
 1903212146 metadata/md5-cache/net-irc/telepathy-idle-0.2.0
 1903212146 metadata/md5-cache/net-irc/weechat-2.4
-1904091039 metadata/md5-cache/sys-auth/keystone-2019.1.9999
+1904110039 metadata/md5-cache/sys-auth/keystone-2019.1.9999
 1903141632 metadata/md5-cache/sys-auth/skey-1.1.5-r11
 1903141632 metadata/md5-cache/sys-auth/pam-script-1.1.9
 1903212146 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
@@ -41501,7 +41385,6 @@
 1904090139 metadata/md5-cache/sys-auth/elogind-241.2
 1903141632 metadata/md5-cache/sys-auth/nss_ldap-265-r5
 1903291609 metadata/md5-cache/sys-auth/polkit-0.115-r1
-1903141632 metadata/md5-cache/sys-auth/pam_mount-2.14
 1903291609 metadata/md5-cache/sys-auth/pam_ldap-186-r1
 1903141632 metadata/md5-cache/sys-auth/ykpers-1.19.0
 1903141632 metadata/md5-cache/sys-auth/pam_krb5-4.7
@@ -41509,7 +41392,6 @@
 1903141632 metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
 1903202239 metadata/md5-cache/sys-auth/realtime-base-0.1
 1903141632 metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
-1903141632 metadata/md5-cache/sys-auth/pam_mount-2.15
 1702282333 metadata/md5-cache/sys-auth/ykclient-2.15
 1903141632 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.8.14-r2
 1903291609 metadata/md5-cache/sys-auth/pam_ssh-1.98
@@ -41555,7 +41437,7 @@
 1903212146 metadata/md5-cache/sys-auth/keystone-2018.2.9999
 1903141632 metadata/md5-cache/sys-auth/google-authenticator-1.05
 1903141632 metadata/md5-cache/sys-auth/libnss-nis-1.4
-1904091039 metadata/md5-cache/sys-auth/Manifest.gz
+1904110139 metadata/md5-cache/sys-auth/Manifest.gz
 1904021639 metadata/md5-cache/sys-auth/pambase-20190402
 1903291609 metadata/md5-cache/sys-auth/sssd-1.16.3-r2
 1903291609 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -41593,6 +41475,7 @@
 1903141632 metadata/md5-cache/sys-auth/google-authenticator-libpam-hardened-9999
 1903291609 metadata/md5-cache/sys-auth/passwdqc-1.3.0
 1903212146 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
+1904110039 metadata/md5-cache/sys-auth/keystone-15.0.0
 1903291609 metadata/md5-cache/sys-auth/pam_abl-0.6.0
 1903141632 metadata/md5-cache/sys-auth/openpam-20140912-r2
 1903141632 metadata/md5-cache/sys-auth/munge-0.5.13
@@ -41614,10 +41497,10 @@
 1903141632 metadata/md5-cache/net-libs/serf-1.3.8-r1
 1903141632 metadata/md5-cache/net-libs/libtorrent-0.13.7
 1903141632 metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
-1903141632 metadata/md5-cache/net-libs/libiio-9999
+1904111909 metadata/md5-cache/net-libs/libiio-9999
 1809180947 metadata/md5-cache/net-libs/liba53-9999
 1904100039 metadata/md5-cache/net-libs/gupnp-av-0.12.11
-1904080039 metadata/md5-cache/net-libs/gnutls-3.6.7
+1904110109 metadata/md5-cache/net-libs/gnutls-3.6.7
 1903212146 metadata/md5-cache/net-libs/xrootd-4.9.0
 1904020009 metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1
 1903141632 metadata/md5-cache/net-libs/libqmi-9999
@@ -41758,7 +41641,6 @@
 1903141632 metadata/md5-cache/net-libs/zeromq-2.2.0
 1903212146 metadata/md5-cache/net-libs/grpc-1.13.1
 1903141632 metadata/md5-cache/net-libs/libupnp-1.8.3-r1
-1904050839 metadata/md5-cache/net-libs/miniupnpc-2.1.20190403
 1903141632 metadata/md5-cache/net-libs/net6-1.3.14-r2
 1903141632 metadata/md5-cache/net-libs/libnftnl-1.1.2-r1
 1804170039 metadata/md5-cache/net-libs/libident-0.32-r1
@@ -41841,11 +41723,10 @@
 1903141632 metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
 1903141632 metadata/md5-cache/net-libs/zeromq-4.3.1
 1903141632 metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
-1903141632 metadata/md5-cache/net-libs/gupnp-av-0.12.10
 1904011539 metadata/md5-cache/net-libs/libqmi-1.22.2
 1903141632 metadata/md5-cache/net-libs/libmicrohttpd-0.9.62
 1904011539 metadata/md5-cache/net-libs/libmbim-1.6.0
-1904100039 metadata/md5-cache/net-libs/Manifest.gz
+1904111909 metadata/md5-cache/net-libs/Manifest.gz
 1903141632 metadata/md5-cache/net-libs/nghttp2-1.33.0
 1807061439 metadata/md5-cache/net-libs/wandio-1.0.5
 1903212146 metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -41872,7 +41753,7 @@
 1903141632 metadata/md5-cache/net-libs/libircclient-1.10
 1903141632 metadata/md5-cache/net-libs/dleyna-renderer-0.5.0
 1903212146 metadata/md5-cache/net-libs/libsearpc-3.0.8-r3
-1903141632 metadata/md5-cache/net-libs/libiio-0.15-r1
+1904111909 metadata/md5-cache/net-libs/libiio-0.15-r1
 1904090209 metadata/md5-cache/net-libs/libpsl-0.20.2
 1903141632 metadata/md5-cache/net-libs/libsrtp-1.6.0
 1806232139 metadata/md5-cache/net-libs/aqbanking-5.7.8
@@ -41894,6 +41775,7 @@
 1903212146 metadata/md5-cache/net-libs/gtk-vnc-0.8.0-r1
 1903212146 metadata/md5-cache/net-libs/openpgm-5.2.122
 1903141632 metadata/md5-cache/net-libs/libvncserver-0.9.11-r1
+1904110939 metadata/md5-cache/net-libs/http-parser-2.9.1
 1903141632 metadata/md5-cache/net-libs/serf-1.3.8
 1903141632 metadata/md5-cache/net-libs/ignition-transport-4.0.0
 1904012339 metadata/md5-cache/net-libs/liboauth-1.0.3-r1
@@ -42044,7 +41926,6 @@
 1903212146 metadata/md5-cache/net-libs/libbtbb-2018.08.1
 1903141632 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
 1903141632 metadata/md5-cache/net-libs/libosmo-abis-9999
-1903141632 metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
 1903141632 metadata/md5-cache/net-libs/daq-2.0.2
 1903141632 metadata/md5-cache/net-libs/shairplay-0_pre20170118
 1903141632 metadata/md5-cache/net-libs/libnfsidmap-0.27
@@ -42067,7 +41948,6 @@
 1903141632 metadata/md5-cache/games-action/fakk2-1.02-r1
 1903141632 metadata/md5-cache/games-action/bomberclone-0.11.8-r1
 1903141632 metadata/md5-cache/games-action/swordandsworcery-1.02
-1904100309 metadata/md5-cache/games-action/minetest-5.0.1
 1707090139 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 1903141632 metadata/md5-cache/games-action/badland-121
 1903141632 metadata/md5-cache/games-action/shootingstar-1.2.0-r1
@@ -42098,7 +41978,7 @@
 1903141632 metadata/md5-cache/games-action/brutal-legend-20130615-r2
 1903141632 metadata/md5-cache/games-action/phobiaii-1.1-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
-1904100309 metadata/md5-cache/games-action/Manifest.gz
+1904112039 metadata/md5-cache/games-action/Manifest.gz
 1903141632 metadata/md5-cache/games-action/super-hexagon-20160217
 1903141632 metadata/md5-cache/games-action/solar2-1.10
 1903212146 metadata/md5-cache/games-action/accelerator3d-0.1.1-r3
@@ -42115,6 +41995,7 @@
 1903141632 metadata/md5-cache/games-action/descent2-data-1.2
 1903141632 metadata/md5-cache/games-action/minetest-0.4.17.1
 1903141632 metadata/md5-cache/games-action/maelstrom-3.0.6-r3
+1904110139 metadata/md5-cache/games-action/minetest-5.0.1-r1
 1903141632 metadata/md5-cache/games-action/bzflag-2.4.12
 1903141632 metadata/md5-cache/games-action/descent2-vertigo-1.0
 1903141632 metadata/md5-cache/games-action/deathchase3d-0.9-r1
@@ -42122,7 +42003,7 @@
 1903141632 metadata/md5-cache/games-action/rune-1.07-r3
 1903141632 metadata/md5-cache/games-action/clanbomber-2.1.1-r1
 1903141632 metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r1
-1903141632 metadata/md5-cache/games-action/lugaru-20151204-r1
+1904112039 metadata/md5-cache/games-action/lugaru-20151204-r1
 1903141632 metadata/md5-cache/games-action/trine2-2.01.425
 1903141632 metadata/md5-cache/games-action/spacearyarya-kxl-1.0.2-r2
 1903141632 metadata/md5-cache/games-action/rrootage-0.23a-r1
@@ -42458,7 +42339,7 @@
 1805012209 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1
 1903141632 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
 1903141632 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
-1904081909 metadata/md5-cache/media-plugins/Manifest.gz
+1904101809 metadata/md5-cache/media-plugins/Manifest.gz
 1903141632 metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.2.4
 1903141632 metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.8
 1903141632 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100
@@ -42612,6 +42493,7 @@
 1903141632 metadata/md5-cache/media-plugins/vdr-lcr-0.0.9
 1903141632 metadata/md5-cache/media-plugins/vdr-ddci2-9999
 1903141632 metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
+1904101809 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14
 1903141632 metadata/md5-cache/media-plugins/vdr-rcu-2.2.0
 1903141632 metadata/md5-cache/media-plugins/vdr-serial-0.0.6a-r1
 1903141632 metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
@@ -43656,7 +43538,7 @@
 1903141632 metadata/md5-cache/dev-libs/cvector-1.0.3-r1
 1903141632 metadata/md5-cache/dev-libs/libaio-0.3.110
 1903141632 metadata/md5-cache/dev-libs/libfmt-9999
-1904080009 metadata/md5-cache/dev-libs/vala-common-0.40.14
+1904110109 metadata/md5-cache/dev-libs/vala-common-0.40.14
 1903281909 metadata/md5-cache/dev-libs/libxmlb-0.1.8
 1903141632 metadata/md5-cache/dev-libs/libgweather-3.26.2
 1903141632 metadata/md5-cache/dev-libs/libzia-4.13
@@ -43998,7 +43880,6 @@
 1903141632 metadata/md5-cache/dev-libs/libsodium-1.0.16-r2
 1903212146 metadata/md5-cache/dev-libs/volume_key-0.3.11
 1903141632 metadata/md5-cache/dev-libs/libbson-0.98.0
-1903141632 metadata/md5-cache/dev-libs/libmirage-3.2.0
 1903212146 metadata/md5-cache/dev-libs/newt-0.52.18
 1901072239 metadata/md5-cache/dev-libs/softhsm-2.5.0
 1903141632 metadata/md5-cache/dev-libs/quantlib-1.7.1
@@ -44006,7 +43887,6 @@
 1903141632 metadata/md5-cache/dev-libs/libiconv-1.15
 1903212146 metadata/md5-cache/dev-libs/liblouis-2.5.3
 1903212146 metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
-1903212146 metadata/md5-cache/dev-libs/libgit2-glib-0.27.7
 1903141632 metadata/md5-cache/dev-libs/gmp-6.1.2
 1903141632 metadata/md5-cache/dev-libs/popt-1.16-r2
 1903141632 metadata/md5-cache/dev-libs/re2-0.2017.03.01
@@ -44112,7 +43992,7 @@
 1903301309 metadata/md5-cache/dev-libs/icu-64.1
 1903141632 metadata/md5-cache/dev-libs/mpfr-4.0.1
 1805121338 metadata/md5-cache/dev-libs/ppl-1.1
-1903212146 metadata/md5-cache/dev-libs/libgit2-9999
+1904101839 metadata/md5-cache/dev-libs/libgit2-9999
 1808151104 metadata/md5-cache/dev-libs/cudnn-7.0.5-r1
 1903150239 metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
 1904090039 metadata/md5-cache/dev-libs/ell-0.9
@@ -44124,7 +44004,7 @@
 1810090339 metadata/md5-cache/dev-libs/skalibs-2.7.0.0
 1903212146 metadata/md5-cache/dev-libs/libcharon-3.6.0
 1903141632 metadata/md5-cache/dev-libs/jansson-2.12
-1904100939 metadata/md5-cache/dev-libs/Manifest.gz
+1904112239 metadata/md5-cache/dev-libs/Manifest.gz
 1903141632 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1903141632 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
 1903141632 metadata/md5-cache/dev-libs/libcli-1.9.7
@@ -44197,11 +44077,11 @@
 1903141632 metadata/md5-cache/dev-libs/pcc-libs-1.1.0
 1903141632 metadata/md5-cache/dev-libs/apr-util-1.5.4
 1904051439 metadata/md5-cache/dev-libs/apr-1.7.0
+1904111909 metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1
 1903141632 metadata/md5-cache/dev-libs/yajl-2.1.0-r2
 1903141632 metadata/md5-cache/dev-libs/wlc-0.0.11
 1903141632 metadata/md5-cache/dev-libs/cyberjack-3.99.5_p12
 1903141632 metadata/md5-cache/dev-libs/libuv-1.23.1
-1903141632 metadata/md5-cache/dev-libs/libmirage-3.2.1
 1903141632 metadata/md5-cache/dev-libs/liboil-0.3.17-r2
 1903141632 metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
 1903141632 metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
@@ -44247,7 +44127,7 @@
 1903141632 metadata/md5-cache/dev-libs/gf2x-1.0-r1
 1903141632 metadata/md5-cache/dev-libs/jemalloc-4.4.0
 1903141632 metadata/md5-cache/dev-libs/OpenNI2-9999
-1904100839 metadata/md5-cache/dev-libs/elfutils-0.173-r1
+1904112239 metadata/md5-cache/dev-libs/elfutils-0.173-r1
 1903141632 metadata/md5-cache/dev-libs/libpcre-8.43
 1903141632 metadata/md5-cache/dev-libs/libgpiod-1.1.1
 1903141632 metadata/md5-cache/dev-libs/libvterm-0.0_pre20160305
@@ -44360,7 +44240,7 @@
 1712150139 metadata/md5-cache/dev-libs/libg15-1.2.7-r1
 1903141632 metadata/md5-cache/dev-libs/libsigc++-1.2.7
 1903141632 metadata/md5-cache/dev-libs/libmaxminddb-1.2.1
-1903212146 metadata/md5-cache/dev-libs/xapian-bindings-1.4.11
+1904112209 metadata/md5-cache/dev-libs/xapian-bindings-1.4.11
 1903212146 metadata/md5-cache/dev-libs/keybinder-0.3.1-r201
 1903141632 metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
 1903300039 metadata/md5-cache/dev-libs/weston-3.0.0
@@ -44415,7 +44295,6 @@
 1903141632 metadata/md5-cache/dev-libs/luise-bin-0.1.1
 1711300240 metadata/md5-cache/dev-libs/tvision-2.2.1.4
 1903141632 metadata/md5-cache/dev-libs/xerces-c-3.2.2
-1903141632 metadata/md5-cache/dev-libs/folks-0.11.4
 1903141632 metadata/md5-cache/dev-libs/rocr-runtime-2.0.0
 1903141632 metadata/md5-cache/dev-libs/qrosscore-0.3.2
 1903181639 metadata/md5-cache/dev-libs/gobject-introspection-common-1.58.3
@@ -44633,7 +44512,7 @@
 1903141632 metadata/md5-cache/dev-libs/libtommath-1.1.0
 1903141632 metadata/md5-cache/dev-libs/sdformat-6.0.0
 1904020509 metadata/md5-cache/dev-libs/libp11-0.4.9
-1903141632 metadata/md5-cache/dev-libs/libowfat-0.32-r1
+1904110109 metadata/md5-cache/dev-libs/libowfat-0.32-r1
 1903151539 metadata/md5-cache/dev-libs/xapian-1.2.25
 1903141632 metadata/md5-cache/dev-libs/libconfig-1.7.1
 1903141632 metadata/md5-cache/dev-libs/pegtl-1.3.1-r1
@@ -44935,12 +44814,13 @@
 1903141632 metadata/md5-cache/sci-chemistry/gromacs-2018.9999
 1903141632 metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r3
 1903141632 metadata/md5-cache/sci-chemistry/molmol-2k_p2-r4
-1903141632 metadata/md5-cache/x11-terms/rxvt-unicode-9999
+1904101709 metadata/md5-cache/x11-terms/rxvt-unicode-9999
 1702282336 metadata/md5-cache/x11-terms/pangoterm-0.0_pre20151022
 1903212146 metadata/md5-cache/x11-terms/terminator-1.91
 1903141632 metadata/md5-cache/x11-terms/xvt-2.1-r3
 1903141632 metadata/md5-cache/x11-terms/st-0.8.1
 1903141632 metadata/md5-cache/x11-terms/sakura-3.6.0
+1904101709 metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r2
 1903212146 metadata/md5-cache/x11-terms/roxterm-3.1.5-r1
 1903291509 metadata/md5-cache/x11-terms/st-9999
 1904091139 metadata/md5-cache/x11-terms/terminology-1.4.0
@@ -44974,7 +44854,7 @@
 1903212146 metadata/md5-cache/x11-terms/guake-3.3.0
 1903212146 metadata/md5-cache/x11-terms/guake-0.8.13
 1903141632 metadata/md5-cache/x11-terms/rxvt-unicode-9.21
-1904091139 metadata/md5-cache/x11-terms/Manifest.gz
+1904102339 metadata/md5-cache/x11-terms/Manifest.gz
 1903212146 metadata/md5-cache/x11-terms/guake-3.3.2
 1903150739 metadata/md5-cache/x11-terms/root-tail-1.2-r4
 1903141632 metadata/md5-cache/x11-terms/mlterm-3.8.6
@@ -44987,7 +44867,6 @@
 1903141632 metadata/md5-cache/x11-terms/mlterm-3.8.4
 1903141632 metadata/md5-cache/x11-terms/mate-terminal-1.18.2
 1806021039 metadata/md5-cache/x11-terms/eterm-0.9.6-r2
-1903141632 metadata/md5-cache/x11-terms/rxvt-unicode-9.22
 1903141632 metadata/md5-cache/x11-terms/cool-retro-term-1.1.0
 1903141632 metadata/md5-cache/x11-terms/alacritty-0.2.3
 1903141632 metadata/md5-cache/x11-terms/alacritty-0.2.9
@@ -45495,7 +45374,7 @@
 1903141632 metadata/md5-cache/app-arch/lcab-1.0_beta12
 1903141632 metadata/md5-cache/app-arch/unrar-5.6.6
 1903141632 metadata/md5-cache/app-arch/zstd-1.3.4
-1904082139 metadata/md5-cache/app-arch/zstd-1.3.7-r1
+1904110109 metadata/md5-cache/app-arch/zstd-1.3.7-r1
 1808071439 metadata/md5-cache/app-arch/upx-bin-3.91
 1903141632 metadata/md5-cache/app-arch/plzip-1.6
 1903141632 metadata/md5-cache/app-arch/zstd-1.3.4-r1
@@ -45522,7 +45401,6 @@
 1903141632 metadata/md5-cache/app-arch/hardlink-0.3.0-r1
 1808151104 metadata/md5-cache/app-arch/dump-0.4.46
 1903141632 metadata/md5-cache/app-arch/pbzip2-1.1.12-r1
-1903141632 metadata/md5-cache/app-arch/lzip-1.20
 1903141632 metadata/md5-cache/app-arch/unmakeself-1.1
 1903212146 metadata/md5-cache/app-arch/brotli-9999
 1903141632 metadata/md5-cache/app-arch/mt-st-1.3
@@ -45539,14 +45417,14 @@
 1903141632 metadata/md5-cache/app-arch/funzix-1.0
 1805030939 metadata/md5-cache/app-arch/lzop-1.04
 1903212146 metadata/md5-cache/app-arch/cfv-1.18.3-r1
-1904092239 metadata/md5-cache/app-arch/Manifest.gz
+1904110109 metadata/md5-cache/app-arch/Manifest.gz
 1903212146 metadata/md5-cache/app-arch/brotli-1.0.3-r1
 1903141632 metadata/md5-cache/app-arch/zstd-1.1.3
 1903141632 metadata/md5-cache/app-arch/pbzip2-1.1.12
 1904012039 metadata/md5-cache/app-arch/lz4-1.8.3
 1903141632 metadata/md5-cache/app-arch/xarchiver-0.5.4.13
 1903212146 metadata/md5-cache/app-arch/vimball-9999
-1904080909 metadata/md5-cache/app-arch/sharutils-4.15.2-r1
+1904101809 metadata/md5-cache/app-arch/sharutils-4.15.2-r1
 1903141632 metadata/md5-cache/app-arch/cpio-2.12-r1
 1903141632 metadata/md5-cache/app-arch/afio-2.5.1-r2
 1903141632 metadata/md5-cache/app-arch/unrar-5.7.2
@@ -45783,6 +45661,7 @@
 1903141632 metadata/md5-cache/dev-db/libzdb-3.0
 1903141632 metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
 1903141632 metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
+1904111309 metadata/md5-cache/dev-db/pgadmin4-4.5
 1903141632 metadata/md5-cache/dev-db/pgmodeler-0.9.1
 1903212146 metadata/md5-cache/dev-db/mongodb-4.0.6
 1903141632 metadata/md5-cache/dev-db/apgdiff-2.2.1
@@ -45822,7 +45701,7 @@
 1903141632 metadata/md5-cache/dev-db/lmdb-0.9.22
 1903141632 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 1903141632 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1904100139 metadata/md5-cache/dev-db/Manifest.gz
+1904111309 metadata/md5-cache/dev-db/Manifest.gz
 1903141632 metadata/md5-cache/dev-db/freetds-9999
 1901180609 metadata/md5-cache/dev-db/percona-toolkit-3.0.13
 1903141632 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.15
@@ -45877,7 +45756,7 @@
 1902141809 metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13
 1903141632 metadata/md5-cache/dev-db/apgdiff-2.2.2
 1903141632 metadata/md5-cache/dev-db/libzdb-2.11.2
-1903170209 metadata/md5-cache/dev-db/lmdb-0.9.23
+1904110239 metadata/md5-cache/dev-db/lmdb-0.9.23
 1812230010 metadata/md5-cache/dev-db/innotop-1.12.0
 1903291609 metadata/md5-cache/dev-db/postgresql-9999
 1903212146 metadata/md5-cache/dev-db/pgxnclient-1.2-r1
@@ -46031,7 +45910,7 @@
 1903212146 metadata/md5-cache/sys-kernel/ck-sources-4.14.63
 1903212146 metadata/md5-cache/sys-kernel/linux-headers-3.18
 1903212146 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.105-r1
-1904091539 metadata/md5-cache/sys-kernel/Manifest.gz
+1904111309 metadata/md5-cache/sys-kernel/Manifest.gz
 1903212146 metadata/md5-cache/sys-kernel/linux-headers-4.9
 1902231439 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 1903141632 metadata/md5-cache/sys-kernel/genkernel-3.5.2.5
@@ -46087,6 +45966,7 @@
 1903231909 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.177
 1904060209 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.34
 1904060339 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.111
+1904111309 metadata/md5-cache/sys-kernel/linux-firmware-20190409
 1903212146 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
 1903141632 metadata/md5-cache/sys-kernel/genkernel-3.4.52.3
 1903212146 metadata/md5-cache/sys-kernel/linux-headers-4.20
@@ -46290,6 +46170,7 @@
 1903141632 metadata/md5-cache/media-gfx/darktable-2.6.1
 1903141632 metadata/md5-cache/media-gfx/xpaint-2.9.10.2
 1903141632 metadata/md5-cache/media-gfx/dmtx-utils-0.7.5
+1904111739 metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
 1903141632 metadata/md5-cache/media-gfx/gthumb-3.6.2
 1903212146 metadata/md5-cache/media-gfx/mcomix-1.2.1
 1805010009 metadata/md5-cache/media-gfx/xfig-3.2.6a-r1
@@ -46313,7 +46194,7 @@
 1903141632 metadata/md5-cache/media-gfx/gtkam-1.0
 1903212146 metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
 1904082239 metadata/md5-cache/media-gfx/gpicview-0.2.5-r1
-1903141632 metadata/md5-cache/media-gfx/maim-5.5.1
+1904111409 metadata/md5-cache/media-gfx/maim-5.5.1
 1903141632 metadata/md5-cache/media-gfx/tintii-2.10.0
 1903212146 metadata/md5-cache/media-gfx/graphite2-1.3.13
 1903212146 metadata/md5-cache/media-gfx/birdfont-2.18.3
@@ -46361,7 +46242,6 @@
 1903212146 metadata/md5-cache/media-gfx/viewnior-1.7-r1
 1903141632 metadata/md5-cache/media-gfx/farbfeld-9999
 1903212146 metadata/md5-cache/media-gfx/fr0st-1.4-r2
-1903212146 metadata/md5-cache/media-gfx/gnome-photos-3.24.6
 1903141632 metadata/md5-cache/media-gfx/fim-0.5_rc3
 1903141632 metadata/md5-cache/media-gfx/greycstoration-2.9-r2
 1903141632 metadata/md5-cache/media-gfx/graphicsmagick-9999
@@ -46404,7 +46284,7 @@
 1903212146 metadata/md5-cache/media-gfx/sigal-1.3.0
 1904012309 metadata/md5-cache/media-gfx/libimagequant-2.12.2
 1903141632 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
-1904100039 metadata/md5-cache/media-gfx/Manifest.gz
+1904111739 metadata/md5-cache/media-gfx/Manifest.gz
 1904061539 metadata/md5-cache/media-gfx/hugin-2019.0.0
 1903141632 metadata/md5-cache/media-gfx/lximage-qt-0.7.0
 1903212146 metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
@@ -46837,6 +46717,7 @@
 1903141632 metadata/md5-cache/games-board/gnuchess-6.2.5
 1702282322 metadata/md5-cache/games-board/mt_gtk_client-0.1.98-r1
 1903141632 metadata/md5-cache/games-board/freedoko-0.7.16-r1
+1904111909 metadata/md5-cache/games-board/grhino-0.16.1-r2
 1903141632 metadata/md5-cache/games-board/natch-2.4-r1
 1702282322 metadata/md5-cache/games-board/maitretarot-0.1.98-r1
 1903141632 metadata/md5-cache/games-board/chessx-1.4.6
@@ -46847,7 +46728,7 @@
 1903141632 metadata/md5-cache/games-board/gnushogi-1.4.1-r1
 1903141632 metadata/md5-cache/games-board/stockfish-8
 1903141632 metadata/md5-cache/games-board/gnugo-3.9.1-r1
-1904031539 metadata/md5-cache/games-board/Manifest.gz
+1904111909 metadata/md5-cache/games-board/Manifest.gz
 1903212146 metadata/md5-cache/games-board/scid-4.6.2-r1
 1903212146 metadata/md5-cache/games-board/gnome-hearts-0.3.1-r2
 1903141632 metadata/md5-cache/games-board/tali-3.22.0
@@ -46888,7 +46769,7 @@
 1903141632 metadata/md5-cache/games-board/gnuchess-6.2.4
 1904092239 metadata/md5-cache/dev-vcs/subversion-1.11.1
 1903212146 metadata/md5-cache/dev-vcs/gitg-3.26.0
-1903141632 metadata/md5-cache/dev-vcs/git-num-2.0.1
+1904111839 metadata/md5-cache/dev-vcs/git-num-2.0.1
 1903212146 metadata/md5-cache/dev-vcs/hg-fast-export-160914
 1903141632 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
 1903141632 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
@@ -46934,7 +46815,7 @@
 1903141632 metadata/md5-cache/dev-vcs/tig-2.4.1
 1903212146 metadata/md5-cache/dev-vcs/git-tools-2017.10
 1903212146 metadata/md5-cache/dev-vcs/git-bz-0.2015.09.08
-1904091709 metadata/md5-cache/dev-vcs/git-2.21.0
+1904112239 metadata/md5-cache/dev-vcs/git-2.21.0
 1903212146 metadata/md5-cache/dev-vcs/bzr-fastimport-0.13.0
 1903212146 metadata/md5-cache/dev-vcs/svneverever-1.3.0
 1903141632 metadata/md5-cache/dev-vcs/cvs-fast-export-1.45
@@ -46991,7 +46872,7 @@
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1903141632 metadata/md5-cache/dev-vcs/svn2git-9999
 1903141632 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1904092239 metadata/md5-cache/dev-vcs/Manifest.gz
+1904112239 metadata/md5-cache/dev-vcs/Manifest.gz
 1903141632 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1903141632 metadata/md5-cache/dev-vcs/hub-2.7.1
 1705101908 metadata/md5-cache/dev-vcs/mr-1.20170129
@@ -47086,7 +46967,7 @@
 1904100039 metadata/md5-cache/gnome-extra/gnome-boxes-3.26.4
 1903242039 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-19
 1903212146 metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
-1903141632 metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
+1904111709 metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r1
 1903212146 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
 1903141632 metadata/md5-cache/gnome-extra/yelp-3.22.0
 1903141632 metadata/md5-cache/gnome-extra/eiciel-0.9.12.1
@@ -47115,11 +46996,9 @@
 1903141632 metadata/md5-cache/gnome-extra/nautilus-actions-3.2.4
 1808151104 metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-21
 1903141632 metadata/md5-cache/gnome-extra/cinnamon-control-center-3.8.0
-1903171739 metadata/md5-cache/gnome-extra/gnome-documents-3.24.3
 1903141632 metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.10
 1903141632 metadata/md5-cache/gnome-extra/sushi-3.24.0
 1904100039 metadata/md5-cache/gnome-extra/nemo-3.6.4-r1
-1903212146 metadata/md5-cache/gnome-extra/nemo-4.0.2
 1903181309 metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.24.3
 1903212146 metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
 1903241839 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.1
@@ -47129,7 +47008,7 @@
 1903141632 metadata/md5-cache/gnome-extra/yelp-3.30.0
 1903141632 metadata/md5-cache/gnome-extra/office-runner-1.0.2
 1903141632 metadata/md5-cache/gnome-extra/libgsf-1.14.45
-1903212146 metadata/md5-cache/gnome-extra/nemo-4.0.6
+1904101539 metadata/md5-cache/gnome-extra/nemo-4.0.6
 1903212146 metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
 1903141632 metadata/md5-cache/gnome-extra/gnome-contacts-3.22.1-r1
 1903212146 metadata/md5-cache/gnome-extra/gnome-logs-3.24.2
@@ -47140,6 +47019,7 @@
 1903141632 metadata/md5-cache/gnome-extra/gnome-power-manager-3.24.0
 1903141632 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.30.0
 1903181309 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.30.2
+1904101539 metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
 1903141632 metadata/md5-cache/gnome-extra/gnome-user-docs-3.24.2
 1903212146 metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
 1903212146 metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
@@ -47155,7 +47035,7 @@
 1903212146 metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
 1901160309 metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-22
 1903212146 metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
-1904100039 metadata/md5-cache/gnome-extra/Manifest.gz
+1904111709 metadata/md5-cache/gnome-extra/Manifest.gz
 1903141632 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.24.0
 1903212146 metadata/md5-cache/gnome-extra/libgda-5.2.4-r3
 1903151639 metadata/md5-cache/gnome-extra/zenity-3.30.0
@@ -47167,7 +47047,6 @@
 1903141632 metadata/md5-cache/gnome-extra/gnome-packagekit-3.24.0
 1903141632 metadata/md5-cache/gnome-extra/cinnamon-menus-4.0.0
 1809300339 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.26.5
-1903212146 metadata/md5-cache/gnome-extra/nemo-3.6.4
 1903141632 metadata/md5-cache/gnome-extra/gnome-characters-3.26.2
 1903141632 metadata/md5-cache/gnome-extra/gnome-calendar-3.24.3
 1903141632 metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
@@ -47179,13 +47058,11 @@
 1903212146 metadata/md5-cache/gnome-extra/gnome-weather-3.24.0
 1903212146 metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
 1903181709 metadata/md5-cache/gnome-extra/gucharmap-11.0.3
-1903212146 metadata/md5-cache/gnome-extra/nemo-3.8.6
 1903212146 metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
 1804122239 metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
 1903211739 metadata/md5-cache/gnome-extra/gnome-user-share-3.28.0
 1903141632 metadata/md5-cache/gnome-extra/cjs-4.0.0
 1903212146 metadata/md5-cache/gnome-extra/evolution-data-server-3.26.6
-1903141632 metadata/md5-cache/gnome-extra/gnome-boxes-3.24.1-r1
 1903141632 metadata/md5-cache/gnome-extra/cinnamon-control-center-4.0.0
 1903180109 metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r5
 1903212146 metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
@@ -47195,7 +47072,7 @@
 1903212146 metadata/md5-cache/gnome-extra/gnome-weather-3.26.0
 1903221539 metadata/md5-cache/gnome-extra/gnome-software-3.30.6
 1903141632 metadata/md5-cache/gnome-extra/gnome-clocks-3.24.0
-1903141632 metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
+1904111709 metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
 1903141632 metadata/md5-cache/gnome-extra/evolution-ews-3.24.6
 1903212146 metadata/md5-cache/gnome-extra/gnome-tweaks-3.24.1
 1903212146 metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
@@ -47206,7 +47083,6 @@
 1903212146 metadata/md5-cache/gnome-extra/libgda-5.2.8-r1
 1903141632 metadata/md5-cache/gnome-extra/libgsf-1.14.43
 1904100039 metadata/md5-cache/gnome-extra/gnome-documents-3.26.3
-1903212146 metadata/md5-cache/gnome-extra/nemo-3.8.5-r1
 1903141632 metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
 1807311209 metadata/md5-cache/gnome-extra/cinnamon-translations-3.8.2
 1903141632 metadata/md5-cache/gnome-extra/mousetweaks-3.12.0
@@ -47218,7 +47094,6 @@
 1903141632 metadata/md5-cache/gnome-base/gnome-control-center-3.24.4
 1903231239 metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
 1903141632 metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
-1903141632 metadata/md5-cache/gnome-base/nautilus-3.24.2.1-r2
 1903291609 metadata/md5-cache/gnome-base/gdm-3.24.3-r1
 1903181309 metadata/md5-cache/gnome-base/gnome-light-3.30.2
 1903291609 metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
@@ -47227,10 +47102,11 @@
 1903141632 metadata/md5-cache/gnome-base/dconf-0.26.1
 1903212146 metadata/md5-cache/gnome-base/gnome-shell-3.24.3
 1903141632 metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1
-1903141632 metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
+1904110509 metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
 1903212146 metadata/md5-cache/gnome-base/gnome-desktop-2.32.1-r2
 1903141632 metadata/md5-cache/gnome-base/libbonobo-2.24.3-r1
 1903141632 metadata/md5-cache/gnome-base/libgtop-2.38.0
+1904101409 metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r1
 1903212146 metadata/md5-cache/gnome-base/gnome-settings-daemon-3.24.4
 1903212146 metadata/md5-cache/gnome-base/nautilus-3.30.5
 1808151104 metadata/md5-cache/gnome-base/gnome-light-3.22.0
@@ -47242,7 +47118,7 @@
 1903211739 metadata/md5-cache/gnome-base/gnome-extra-apps-3.24.2
 1903212146 metadata/md5-cache/gnome-base/gvfs-1.38.2
 1903212146 metadata/md5-cache/gnome-base/dconf-editor-3.30.2
-1904100039 metadata/md5-cache/gnome-base/Manifest.gz
+1904110509 metadata/md5-cache/gnome-base/Manifest.gz
 1903211739 metadata/md5-cache/gnome-base/gnome-extra-apps-3.30.2
 1903141632 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.28.1
 1903111939 metadata/md5-cache/gnome-base/gnome-core-libs-3.30.2
@@ -47364,7 +47240,7 @@
 1805012209 metadata/md5-cache/mail-filter/procmail-lib-20091202
 1903141632 metadata/md5-cache/mail-filter/libsrs_alt-1.0
 1903141632 metadata/md5-cache/mail-filter/dspam-3.10.2-r1
-1904080109 metadata/md5-cache/mail-filter/Manifest.gz
+1904112239 metadata/md5-cache/mail-filter/Manifest.gz
 1903141632 metadata/md5-cache/mail-filter/libsrs2-1.0.18
 1903141632 metadata/md5-cache/mail-filter/rspamd-1.7.7
 1903271739 metadata/md5-cache/mail-filter/postfwd-2.00
@@ -47417,7 +47293,7 @@
 1903141632 metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1
 1805012209 metadata/md5-cache/mail-filter/clamassassin-1.2.4
 1903141632 metadata/md5-cache/mail-filter/imapfilter-2.6.12
-1903161839 metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
+1904112239 metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
 1903141632 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
 1903141632 metadata/md5-cache/mail-filter/milter-regex-2.2
 1903141632 metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
@@ -47478,6 +47354,7 @@
 1702282308 metadata/md5-cache/app-doc/single-unix-specification-4_p2
 1903212146 metadata/md5-cache/app-doc/gimp-help-2.8.2
 1807080109 metadata/md5-cache/app-doc/phrack-25
+1904101439 metadata/md5-cache/app-doc/gnucash-docs-3.5
 1702282308 metadata/md5-cache/app-doc/geant-docs-4.9.6
 1903141632 metadata/md5-cache/app-doc/elisp-manual-20.2.5
 1807080109 metadata/md5-cache/app-doc/phrack-69
@@ -47508,7 +47385,7 @@
 1807080109 metadata/md5-cache/app-doc/phrack-45
 1807080109 metadata/md5-cache/app-doc/phrack-57
 1807080109 metadata/md5-cache/app-doc/phrack-18
-1904072009 metadata/md5-cache/app-doc/Manifest.gz
+1904101439 metadata/md5-cache/app-doc/Manifest.gz
 1807080109 metadata/md5-cache/app-doc/phrack-17
 1703061238 metadata/md5-cache/app-doc/linuxfromscratch-7.10
 1807080109 metadata/md5-cache/app-doc/phrack-22
@@ -47582,10 +47459,11 @@
 1903141632 metadata/md5-cache/xfce-base/xfce4-settings-4.13.5
 1904080039 metadata/md5-cache/xfce-base/exo-0.12.4
 1903141632 metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
-1904082239 metadata/md5-cache/xfce-base/Manifest.gz
+1904101139 metadata/md5-cache/xfce-base/Manifest.gz
 1902112049 metadata/md5-cache/xfce-base/xfconf-4.12.1-r1
 1903141632 metadata/md5-cache/xfce-base/xfdesktop-4.12.4
 1903141632 metadata/md5-cache/xfce-base/thunar-1.8.4
+1904101139 metadata/md5-cache/xfce-base/xfwm4-4.13.1-r2
 1903312139 metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r2
 1812071909 metadata/md5-cache/xfce-base/xfce4-appfinder-4.13.2
 1903312139 metadata/md5-cache/xfce-base/xfce4-session-4.13.1
@@ -47607,7 +47485,7 @@
 1904041409 metadata/md5-cache/app-editors/gnome-latex-3.22.1
 1903141632 metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
 1904020009 metadata/md5-cache/app-editors/kile-2.9.92-r1
-1904091539 metadata/md5-cache/app-editors/vim-9999
+1904111609 metadata/md5-cache/app-editors/vim-9999
 1903250109 metadata/md5-cache/app-editors/nano-9999
 1903141632 metadata/md5-cache/app-editors/mousepad-0.4.1
 1903212146 metadata/md5-cache/app-editors/gvim-8.1.0648
@@ -47638,7 +47516,7 @@
 1903141632 metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
 1903141632 metadata/md5-cache/app-editors/ersatz-emacs-20060515
 1702282308 metadata/md5-cache/app-editors/le-1.16.1
-1904091539 metadata/md5-cache/app-editors/vim-8.1.0648-r1
+1904112239 metadata/md5-cache/app-editors/vim-8.1.0648-r1
 1903141632 metadata/md5-cache/app-editors/vim-core-8.0.1699
 1903212146 metadata/md5-cache/app-editors/bluefish-2.2.10
 1903141632 metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
@@ -47647,7 +47525,7 @@
 1903141632 metadata/md5-cache/app-editors/padre-1.0.0
 1812291109 metadata/md5-cache/app-editors/xvile-9.8t
 1903141632 metadata/md5-cache/app-editors/joe-4.4
-1904082109 metadata/md5-cache/app-editors/vim-core-8.1.0648
+1904110109 metadata/md5-cache/app-editors/vim-core-8.1.0648
 1903141632 metadata/md5-cache/app-editors/vim-core-9999
 1903141632 metadata/md5-cache/app-editors/sandy-0.4
 1903141632 metadata/md5-cache/app-editors/joe-4.3-r1
@@ -47701,7 +47579,7 @@
 1903212146 metadata/md5-cache/app-editors/atom-1.32.1
 1903141632 metadata/md5-cache/app-editors/ee-1.5.2
 1904011839 metadata/md5-cache/app-editors/nano-4.0-r1
-1904100909 metadata/md5-cache/app-editors/Manifest.gz
+1904112239 metadata/md5-cache/app-editors/Manifest.gz
 1903141632 metadata/md5-cache/app-editors/jedit-5.2.0-r1
 1903141632 metadata/md5-cache/app-editors/emacs-24.5-r5
 1903141632 metadata/md5-cache/app-editors/jove-4.16.0.73
@@ -47752,7 +47630,7 @@
 1811292309 metadata/md5-cache/app-editors/bvi-1.4.0
 1903141632 metadata/md5-cache/app-editors/nedit-5.6-r1
 1903141632 metadata/md5-cache/app-editors/jext-5.0-r2
-1904082239 metadata/md5-cache/app-editors/gvim-8.1.0648-r1
+1904112239 metadata/md5-cache/app-editors/gvim-8.1.0648-r1
 1903212146 metadata/md5-cache/app-editors/qhexedit2-0.8.4
 1903212146 metadata/md5-cache/app-editors/vim-8.1.0412
 1903221309 metadata/md5-cache/app-editors/emacs-26.2_rc1
@@ -48095,7 +47973,7 @@
 1903141632 metadata/md5-cache/dev-lang/lua-5.2.3
 1903141632 metadata/md5-cache/dev-lang/luajit-2.0.5-r1
 1903141632 metadata/md5-cache/dev-lang/tk-8.5.17-r1
-1903141632 metadata/md5-cache/dev-lang/tcc-0.9.26-r1
+1904110139 metadata/md5-cache/dev-lang/go-1.11.8
 1903141632 metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
 1903141632 metadata/md5-cache/dev-lang/lua-5.3.5
 1903141632 metadata/md5-cache/dev-lang/lua-5.3.3
@@ -48180,7 +48058,6 @@
 1903141632 metadata/md5-cache/dev-lang/micropython-1.9.3
 1903141632 metadata/md5-cache/dev-lang/moarvm-9999
 1903141632 metadata/md5-cache/dev-lang/crystal-0.27.0
-1903141632 metadata/md5-cache/dev-lang/tcc-0.9.26-r2
 1903212146 metadata/md5-cache/dev-lang/python-exec-9999
 1903141632 metadata/md5-cache/dev-lang/rebol-9999
 1903141632 metadata/md5-cache/dev-lang/fpc-3.0.2
@@ -48207,7 +48084,7 @@
 1903212146 metadata/md5-cache/dev-lang/python-3.6.8
 1903141632 metadata/md5-cache/dev-lang/ruby-2.6.2
 1903141632 metadata/md5-cache/dev-lang/whitespace-0.4
-1904100939 metadata/md5-cache/dev-lang/Manifest.gz
+1904110739 metadata/md5-cache/dev-lang/Manifest.gz
 1903141632 metadata/md5-cache/dev-lang/xsb-3.7.0-r1
 1903141632 metadata/md5-cache/dev-lang/ghc-7.10.3
 1903141632 metadata/md5-cache/dev-lang/erlang-21.1.1
@@ -48234,6 +48111,7 @@
 1903141632 metadata/md5-cache/dev-lang/mono-4.8.0.524
 1903141632 metadata/md5-cache/dev-lang/open-cobol-1.1
 1903141632 metadata/md5-cache/dev-lang/erlang-20.3.8.20
+1904110139 metadata/md5-cache/dev-lang/go-1.12.3
 1903141632 metadata/md5-cache/dev-lang/luajit-2.0.2
 1903141632 metadata/md5-cache/dev-lang/polyml-5.5.0
 1702282312 metadata/md5-cache/dev-lang/nwcc-0.8.2
@@ -48425,6 +48303,7 @@
 1903212146 metadata/md5-cache/dev-python/cssselect-1.0.3
 1903212146 metadata/md5-cache/dev-python/fido2-0.5.0
 1903212146 metadata/md5-cache/dev-python/sparql-wrapper-1.7.6
+1904110209 metadata/md5-cache/dev-python/oauth2client-4.1.3
 1903212146 metadata/md5-cache/dev-python/requests-toolbelt-0.7.0
 1903212146 metadata/md5-cache/dev-python/icalendar-3.11.7-r1
 1903212146 metadata/md5-cache/dev-python/imageio-2.1.1
@@ -48477,6 +48356,7 @@
 1903212146 metadata/md5-cache/dev-python/django-picklefield-0.3.2
 1903212146 metadata/md5-cache/dev-python/webut-0.1.0.2-r1
 1903212146 metadata/md5-cache/dev-python/django-filter-2.1.0
+1904110139 metadata/md5-cache/dev-python/django-rq-1.3.1
 1903212146 metadata/md5-cache/dev-python/flask-api-1.1
 1903212146 metadata/md5-cache/dev-python/oauth2client-4.1.2
 1903212146 metadata/md5-cache/dev-python/schema-0.6.6
@@ -48505,6 +48385,7 @@
 1904091039 metadata/md5-cache/dev-python/repoze-lru-0.7
 1903212146 metadata/md5-cache/dev-python/pycodestyle-2.3.1
 1903212146 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
+1904110209 metadata/md5-cache/dev-python/python-novaclient-13.0.0
 1903212146 metadata/md5-cache/dev-python/gql-0.1.0
 1903212146 metadata/md5-cache/dev-python/namespace-jaraco-1
 1903212146 metadata/md5-cache/dev-python/fido2-0.4.0
@@ -48763,6 +48644,7 @@
 1903212146 metadata/md5-cache/dev-python/whelk-2.7.1
 1903212146 metadata/md5-cache/dev-python/xarray-0.9.6
 1903212146 metadata/md5-cache/dev-python/easy-thumbnails-2.4.1
+1904111439 metadata/md5-cache/dev-python/docker-py-3.7.0
 1903212146 metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
 1903212146 metadata/md5-cache/dev-python/waitress-1.0.2-r1
 1903260039 metadata/md5-cache/dev-python/keyring-18.0.1
@@ -48833,7 +48715,7 @@
 1903212146 metadata/md5-cache/dev-python/async_timeout-1.2.0
 1903212146 metadata/md5-cache/dev-python/h5py-2.9.0
 1903212146 metadata/md5-cache/dev-python/pypy-9999
-1903212146 metadata/md5-cache/dev-python/google-auth-1.0.1
+1904110209 metadata/md5-cache/dev-python/google-auth-1.0.1
 1903212146 metadata/md5-cache/dev-python/pdoc-0.3.2
 1903212146 metadata/md5-cache/dev-python/mpi4py-3.0.0
 1903212146 metadata/md5-cache/dev-python/python-troveclient-1.3.0
@@ -48865,7 +48747,7 @@
 1903212146 metadata/md5-cache/dev-python/pyrax-1.9.7
 1903212146 metadata/md5-cache/dev-python/stevedore-1.28.0
 1903212146 metadata/md5-cache/dev-python/pyflakes-0.8.1
-1903212146 metadata/md5-cache/dev-python/google-api-python-client-1.6.5
+1904110209 metadata/md5-cache/dev-python/google-api-python-client-1.6.5
 1903212146 metadata/md5-cache/dev-python/backports-lzma-0.0.10
 1903212146 metadata/md5-cache/dev-python/clang-python-4.0.1
 1903212146 metadata/md5-cache/dev-python/zict-0.1.2
@@ -48885,6 +48767,7 @@
 1904100839 metadata/md5-cache/dev-python/cookies-2.2.1
 1903212146 metadata/md5-cache/dev-python/cffi-1.11.5
 1903212146 metadata/md5-cache/dev-python/mmh3-2.5.1
+1904111739 metadata/md5-cache/dev-python/decorator-4.3.2
 1903212146 metadata/md5-cache/dev-python/wsgiproxy2-0.4.4-r1
 1903212146 metadata/md5-cache/dev-python/pyotp-2.2.6-r1
 1903212146 metadata/md5-cache/dev-python/pyalsa-1.0.29
@@ -48899,6 +48782,7 @@
 1903212146 metadata/md5-cache/dev-python/uranium-3.4.1
 1903212146 metadata/md5-cache/dev-python/minidb-2.0.2
 1903212146 metadata/md5-cache/dev-python/pyparsing-2.3.0
+1904110909 metadata/md5-cache/dev-python/more-itertools-7.0.0
 1904091039 metadata/md5-cache/dev-python/coverage-4.5.2
 1903212146 metadata/md5-cache/dev-python/socketio-client-0.6.6
 1903212146 metadata/md5-cache/dev-python/storm-0.20-r1
@@ -49062,6 +48946,7 @@
 1903212146 metadata/md5-cache/dev-python/google-apitools-0.5.22-r1
 1903212146 metadata/md5-cache/dev-python/zstandard-0.11.0
 1903212146 metadata/md5-cache/dev-python/xlutils-1.7.1
+1904110209 metadata/md5-cache/dev-python/python-neutronclient-6.12.0
 1903212146 metadata/md5-cache/dev-python/six-1.10.0
 1903212146 metadata/md5-cache/dev-python/mongoengine-0.10.6
 1903212146 metadata/md5-cache/dev-python/libiscsi-python-9999
@@ -49275,13 +49160,14 @@
 1903212146 metadata/md5-cache/dev-python/wtforms-2.1
 1903212146 metadata/md5-cache/dev-python/python-heatclient-1.8.2
 1903212146 metadata/md5-cache/dev-python/kaa-display-0.1.0-r1
-1903212146 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
+1904110209 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
 1903212146 metadata/md5-cache/dev-python/python-etcd-0.3.3
 1903212146 metadata/md5-cache/dev-python/amodem-1.13.1
 1903212146 metadata/md5-cache/dev-python/psutil-5.4.1
 1903212146 metadata/md5-cache/dev-python/imagesize-0.7.1
 1903212146 metadata/md5-cache/dev-python/pythondialog-3.4.0
 1903212146 metadata/md5-cache/dev-python/doc8-0.6.0
+1904110209 metadata/md5-cache/dev-python/openstacksdk-0.27.0
 1903212146 metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
 1903212146 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.10
 1903212146 metadata/md5-cache/dev-python/Babel-2.5.3
@@ -49374,7 +49260,7 @@
 1903212146 metadata/md5-cache/dev-python/python-cinderclient-3.1.0
 1903212146 metadata/md5-cache/dev-python/flake8-2.1.0
 1903212146 metadata/md5-cache/dev-python/pyev-0.9.0
-1903212146 metadata/md5-cache/dev-python/uritemplate-3.0.0
+1904110209 metadata/md5-cache/dev-python/uritemplate-3.0.0
 1903212146 metadata/md5-cache/dev-python/wheel-0.32.3
 1903212146 metadata/md5-cache/dev-python/prettytable-0.7.1-r1
 1903212146 metadata/md5-cache/dev-python/pystache-0.5.4
@@ -49442,7 +49328,8 @@
 1903270209 metadata/md5-cache/dev-python/pychroot-9999
 1903212146 metadata/md5-cache/dev-python/python-scw-0.4.7-r1
 1903212146 metadata/md5-cache/dev-python/vobject-0.9.3
-1903212146 metadata/md5-cache/dev-python/pyudev-0.21.0
+1904110209 metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1
+1904110209 metadata/md5-cache/dev-python/pyudev-0.21.0
 1903212146 metadata/md5-cache/dev-python/hacking-1.1.0
 1903212146 metadata/md5-cache/dev-python/pycurl-7.43.0.2
 1903212146 metadata/md5-cache/dev-python/pyvtk-0.4.74
@@ -49473,6 +49360,7 @@
 1903212146 metadata/md5-cache/dev-python/setuptools-40.7.3
 1903212146 metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
 1903212146 metadata/md5-cache/dev-python/jupyter-1.0.0-r1
+1904110209 metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
 1903212146 metadata/md5-cache/dev-python/emcee-2.2.1
 1903212146 metadata/md5-cache/dev-python/bottle-0.12.13
 1903212146 metadata/md5-cache/dev-python/flask-pymongo-0.4.1
@@ -49646,7 +49534,6 @@
 1903212146 metadata/md5-cache/dev-python/QtPy-1.4.0-r1
 1903212146 metadata/md5-cache/dev-python/astropy-1.2.1
 1903212146 metadata/md5-cache/dev-python/python-bibtex-1.2.7-r2
-1904050839 metadata/md5-cache/dev-python/miniupnpc-2.1.20190403
 1903212146 metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
 1903212146 metadata/md5-cache/dev-python/pyhcl-0.2.3
 1903260039 metadata/md5-cache/dev-python/python-heatclient-1.16.2
@@ -49750,6 +49637,7 @@
 1903212146 metadata/md5-cache/dev-python/jsonmerge-1.3.0
 1903212146 metadata/md5-cache/dev-python/eventlet-0.21.0-r1
 1903212146 metadata/md5-cache/dev-python/numexpr-2.6.9
+1904110209 metadata/md5-cache/dev-python/osc-lib-1.12.1
 1904082139 metadata/md5-cache/dev-python/fabric-2.3.1
 1903212146 metadata/md5-cache/dev-python/jaraco-packaging-4.1
 1903212146 metadata/md5-cache/dev-python/yappi-0.98
@@ -49766,7 +49654,7 @@
 1808151104 metadata/md5-cache/dev-python/python-docs-3.6.3
 1903212146 metadata/md5-cache/dev-python/nbsphinx-0.4.1
 1903212146 metadata/md5-cache/dev-python/cairocffi-0.8.0
-1904100839 metadata/md5-cache/dev-python/httplib2-0.12.1
+1904102039 metadata/md5-cache/dev-python/httplib2-0.12.1
 1903212146 metadata/md5-cache/dev-python/python-gflags-3.1.2
 1904090439 metadata/md5-cache/dev-python/hypothesis-3.74.3
 1903212146 metadata/md5-cache/dev-python/reno-2.11.2
@@ -49780,7 +49668,7 @@
 1903212146 metadata/md5-cache/dev-python/python-manilaclient-1.14.0
 1904091039 metadata/md5-cache/dev-python/couchdb-python-1.1
 1903212146 metadata/md5-cache/dev-python/turbolift-2.1.3
-1903212146 metadata/md5-cache/dev-python/collective-checkdocs-0.2
+1904110209 metadata/md5-cache/dev-python/collective-checkdocs-0.2
 1903212146 metadata/md5-cache/dev-python/ipaddr-2.2.0
 1903212146 metadata/md5-cache/dev-python/easy-thumbnails-2.2
 1903212146 metadata/md5-cache/dev-python/tempora-1.12
@@ -49901,6 +49789,7 @@
 1903212146 metadata/md5-cache/dev-python/cangjie-1.3
 1904100839 metadata/md5-cache/dev-python/glance_store-0.28.0
 1903212146 metadata/md5-cache/dev-python/greenlet-0.4.13
+1904110909 metadata/md5-cache/dev-python/hypothesis-4.15.0
 1903212146 metadata/md5-cache/dev-python/hachoir-core-1.3.3-r1
 1903212146 metadata/md5-cache/dev-python/tweepy-3.5.0
 1903212146 metadata/md5-cache/dev-python/tweepy-2.3
@@ -49921,6 +49810,7 @@
 1903212146 metadata/md5-cache/dev-python/llfuse-1.3.5
 1903212146 metadata/md5-cache/dev-python/pytest-runner-4.0
 1903212146 metadata/md5-cache/dev-python/pushbullet-py-0.11.0
+1904110209 metadata/md5-cache/dev-python/psutil-5.6.0
 1903212146 metadata/md5-cache/dev-python/libnatpmp-20150609
 1903212146 metadata/md5-cache/dev-python/ansi2html-1.1.1
 1903212146 metadata/md5-cache/dev-python/pbr-3.1.1
@@ -50103,6 +49993,7 @@
 1903212146 metadata/md5-cache/dev-python/pyacoustid-1.1.5
 1903212146 metadata/md5-cache/dev-python/cliff-tablib-1.1-r2
 1903212146 metadata/md5-cache/dev-python/pypax-0.9.4
+1904110209 metadata/md5-cache/dev-python/os-client-config-1.32.0
 1903212146 metadata/md5-cache/dev-python/pytest-html-1.16.0
 1903212146 metadata/md5-cache/dev-python/robotframework-sshlibrary-2.1.3
 1903212146 metadata/md5-cache/dev-python/attrs-18.2.0
@@ -50144,6 +50035,7 @@
 1903212146 metadata/md5-cache/dev-python/mccabe-0.6.1
 1903212146 metadata/md5-cache/dev-python/django-openid-auth-0.5
 1903212146 metadata/md5-cache/dev-python/SaltTesting-2018.1.16
+1904110909 metadata/md5-cache/dev-python/attrs-19.1.0
 1903212146 metadata/md5-cache/dev-python/astor-0.7.1
 1903212146 metadata/md5-cache/dev-python/lit-6.0.1
 1903212146 metadata/md5-cache/dev-python/datashape-0.5.4
@@ -50219,7 +50111,7 @@
 1903212146 metadata/md5-cache/dev-python/iminuit-1.2
 1903212146 metadata/md5-cache/dev-python/m2r-0.1.6
 1903212146 metadata/md5-cache/dev-python/steadymark-0.5.3
-1903212146 metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
+1904110209 metadata/md5-cache/dev-python/google-auth-httplib2-0.0.2
 1903212146 metadata/md5-cache/dev-python/requests-toolbelt-0.5.1
 1903212146 metadata/md5-cache/dev-python/lesscpy-0.13.0
 1903262209 metadata/md5-cache/dev-python/click-6.7
@@ -50257,7 +50149,7 @@
 1903212146 metadata/md5-cache/dev-python/theano-0.9.0
 1904091039 metadata/md5-cache/dev-python/oslo-utils-3.40.3
 1903212146 metadata/md5-cache/dev-python/python-magic-0.4.15
-1904100839 metadata/md5-cache/dev-python/Manifest.gz
+1904111739 metadata/md5-cache/dev-python/Manifest.gz
 1903212146 metadata/md5-cache/dev-python/mamba-0.8.6
 1903212146 metadata/md5-cache/dev-python/spyder-3.2.4
 1903212146 metadata/md5-cache/dev-python/logfury-0.1.2
@@ -50330,7 +50222,7 @@
 1903212146 metadata/md5-cache/dev-python/ImageHash-3.4
 1903212146 metadata/md5-cache/dev-python/requests-ntlm-1.0.0
 1903212146 metadata/md5-cache/dev-python/sh-1.11
-1903212146 metadata/md5-cache/dev-python/keyring-13.2.1
+1904110209 metadata/md5-cache/dev-python/keyring-13.2.1
 1903212146 metadata/md5-cache/dev-python/junit-xml-1.8
 1903212146 metadata/md5-cache/dev-python/rospkg-1.1.7
 1903212146 metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
@@ -50448,7 +50340,7 @@
 1903212146 metadata/md5-cache/dev-python/emcee-2.1.0
 1903212146 metadata/md5-cache/dev-python/pastescript-2.0.2-r1
 1903212146 metadata/md5-cache/dev-python/blessings-1.6-r1
-1903212146 metadata/md5-cache/dev-python/secretstorage-2.3.1
+1904110209 metadata/md5-cache/dev-python/secretstorage-2.3.1
 1903212146 metadata/md5-cache/dev-python/stsci-distutils-0.3.7
 1903212146 metadata/md5-cache/dev-python/asciitable-0.8.0-r1
 1903212146 metadata/md5-cache/dev-python/atom-0.4.1
@@ -50583,7 +50475,7 @@
 1904080039 metadata/md5-cache/dev-python/zstandard-0.8.1
 1904091039 metadata/md5-cache/dev-python/scrypt-0.8.13
 1903212146 metadata/md5-cache/dev-python/simplekv-0.11.11
-1903212146 metadata/md5-cache/dev-python/rsa-3.4.2
+1904110209 metadata/md5-cache/dev-python/rsa-3.4.2
 1903212146 metadata/md5-cache/dev-python/scapy-python3-0.23
 1904091039 metadata/md5-cache/dev-python/os-testr-1.0.0
 1903270439 metadata/md5-cache/dev-python/kazoo-2.6.1
@@ -51179,7 +51071,7 @@
 1903212146 metadata/md5-cache/dev-python/fuzzywuzzy-0.12.0
 1903212146 metadata/md5-cache/dev-python/repoze-lru-0.6-r3
 1903212146 metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1
-1903212146 metadata/md5-cache/dev-python/google-auth-1.4.1
+1904110209 metadata/md5-cache/dev-python/google-auth-1.4.1
 1903212146 metadata/md5-cache/dev-python/python-ironicclient-2.2.1
 1903212146 metadata/md5-cache/dev-python/treq-0.2.1
 1903212146 metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -51200,6 +51092,7 @@
 1904100839 metadata/md5-cache/dev-python/cloudpickle-0.3.1
 1903212146 metadata/md5-cache/dev-python/parsedatetime-2.4-r1
 1903212146 metadata/md5-cache/dev-python/waitress-1.0.1
+1904110209 metadata/md5-cache/dev-python/munch-2.3.2
 1903212146 metadata/md5-cache/dev-python/wrapt-1.10.11
 1903212146 metadata/md5-cache/dev-python/pyflakes-1.6.0
 1903212146 metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
@@ -51245,7 +51138,7 @@
 1904100839 metadata/md5-cache/dev-python/zict-0.1.3
 1903212146 metadata/md5-cache/dev-python/aodhclient-1.0.0
 1903212146 metadata/md5-cache/dev-python/python-memcached-1.53-r1
-1903212146 metadata/md5-cache/dev-python/rtslib-fb-2.1.69
+1904110209 metadata/md5-cache/dev-python/rtslib-fb-2.1.69
 1903212146 metadata/md5-cache/dev-python/beanstalkc-0.4.0-r1
 1903212146 metadata/md5-cache/dev-python/wcsaxes-0.9
 1903212146 metadata/md5-cache/dev-python/webencodings-0.5.1
@@ -51327,6 +51220,7 @@
 1903212146 metadata/md5-cache/dev-python/requests-kerberos-0.11.0
 1903212146 metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
 1903212146 metadata/md5-cache/dev-python/jsonschema-2.6.0
+1904110139 metadata/md5-cache/dev-python/rq-0.13.0
 1903212146 metadata/md5-cache/dev-python/cli_helpers-1.0.0
 1903212146 metadata/md5-cache/dev-python/parso-0.3.1
 1903212146 metadata/md5-cache/dev-python/pytest-timeout-1.2.0
@@ -51418,6 +51312,7 @@
 1903212146 metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
 1903212146 metadata/md5-cache/dev-python/elasticsearch-curator-5.4.1
 1903212146 metadata/md5-cache/dev-python/pyspf-2.0.12
+1904110209 metadata/md5-cache/dev-python/python-openstackclient-3.18.0
 1903212146 metadata/md5-cache/dev-python/pyrex-0.9.9-r1
 1903212146 metadata/md5-cache/dev-python/jmespath-0.9.3
 1903212146 metadata/md5-cache/dev-python/cheroot-6.0.0-r1
@@ -51441,7 +51336,7 @@
 1903212146 metadata/md5-cache/dev-python/rackspace-monitoring-0.6.5
 1903212146 metadata/md5-cache/dev-python/oct2py-3.6.0
 1903212146 metadata/md5-cache/dev-python/specutils-0.2
-1903212146 metadata/md5-cache/dev-python/tooz-1.60.1
+1904110209 metadata/md5-cache/dev-python/tooz-1.60.1
 1903212146 metadata/md5-cache/dev-python/pytest-cython-0.1.0
 1903212146 metadata/md5-cache/dev-python/aiohttp-3.3.0
 1903212146 metadata/md5-cache/dev-python/pyhamcrest-1.9.0
@@ -51582,6 +51477,7 @@
 1903212146 metadata/md5-cache/dev-python/munch-2.1.1
 1903212146 metadata/md5-cache/dev-python/python-systemd-233
 1903212146 metadata/md5-cache/dev-python/tqdm-4.23.3
+1904110209 metadata/md5-cache/dev-python/oslo-reports-1.29.2
 1903212146 metadata/md5-cache/dev-python/pycups-1.9.73
 1903212146 metadata/md5-cache/dev-python/minidb-2.0.2-r1
 1903212146 metadata/md5-cache/dev-python/os-win-3.0.1
@@ -51707,7 +51603,6 @@
 1903212146 metadata/md5-cache/dev-python/flexx-0.3.1
 1903212146 metadata/md5-cache/dev-python/characteristic-14.3.0-r1
 1903212146 metadata/md5-cache/dev-python/carbon-0.9.13
-1903212146 metadata/md5-cache/dev-python/miniupnpc-2.0.20180503
 1903212146 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0
 1903212146 metadata/md5-cache/dev-python/bokeh-0.12.6
 1903212146 metadata/md5-cache/dev-python/babelfish-9999
@@ -51809,7 +51704,7 @@
 1903212146 metadata/md5-cache/dev-python/pandas-0.19.1
 1903212146 metadata/md5-cache/dev-python/clientcookie-1.3.0-r1
 1903212146 metadata/md5-cache/dev-python/colorama-0.3.3
-1903212146 metadata/md5-cache/dev-python/rsa-3.2.3-r1
+1904110209 metadata/md5-cache/dev-python/rsa-3.2.3-r1
 1903250339 metadata/md5-cache/dev-python/os-brick-2.5.5
 1903212146 metadata/md5-cache/dev-python/flask-babelex-0.9.3
 1903212146 metadata/md5-cache/dev-python/django-js-asset-1.2.2
@@ -52600,7 +52495,7 @@
 1903141632 metadata/md5-cache/app-shells/hstr-2.0
 1903141632 metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
 1903190509 metadata/md5-cache/app-shells/posh-0.13.2
-1904091939 metadata/md5-cache/app-shells/Manifest.gz
+1904111139 metadata/md5-cache/app-shells/Manifest.gz
 1702282309 metadata/md5-cache/app-shells/bashdb-4.3.0.91-r2
 1902122139 metadata/md5-cache/app-shells/mcfly-0.3.3
 1812191709 metadata/md5-cache/app-shells/zsh-completions-0.29.0
@@ -52638,13 +52533,12 @@
 1903141632 metadata/md5-cache/app-shells/esh-0.8.5-r2
 1903141632 metadata/md5-cache/app-shells/fish-9999
 1903141632 metadata/md5-cache/app-shells/quoter-3.0_p2-r1
-1904091939 metadata/md5-cache/app-shells/autojump-22.5.3
+1904111139 metadata/md5-cache/app-shells/autojump-22.5.3
 1702282309 metadata/md5-cache/app-shells/rc-1.7.4-r1
 1903141632 metadata/md5-cache/app-shells/ksh-93.20160110
 1812191709 metadata/md5-cache/app-shells/zsh-completions-0.30.0
 1903141632 metadata/md5-cache/net-im/prosody-0.11.2
 1903141632 metadata/md5-cache/net-im/jabber-base-0.01-r1
-1903141632 metadata/md5-cache/net-im/skypeforlinux-8.34.0.78
 1702282328 metadata/md5-cache/net-im/gg-transport-2.2.6
 1903212146 metadata/md5-cache/net-im/ekg2-9999
 1904100039 metadata/md5-cache/net-im/dianara-1.4.2
@@ -52691,10 +52585,11 @@
 1903141632 metadata/md5-cache/net-im/bitlbee-facebook-1.2.0
 1903141632 metadata/md5-cache/net-im/bitlbee-facebook-1.1.2
 1903251609 metadata/md5-cache/net-im/telegram-desktop-bin-1.6.2
-1904100039 metadata/md5-cache/net-im/Manifest.gz
+1904112309 metadata/md5-cache/net-im/Manifest.gz
 1903191739 metadata/md5-cache/net-im/prosody-0.11.2-r1
 1903141632 metadata/md5-cache/net-im/ricochet-1.1.4
 1903141632 metadata/md5-cache/net-im/cpop-0.0.4-r1
+1904112309 metadata/md5-cache/net-im/skypeforlinux-8.34.0.78-r1
 1903141632 metadata/md5-cache/net-im/purple-events-0.99.1
 1903141632 metadata/md5-cache/net-im/slack-bin-3.1.1
 1903301309 metadata/md5-cache/net-im/psi-9999
@@ -52760,6 +52655,7 @@
 1903141632 metadata/md5-cache/dev-cpp/glog-0.3.3-r1
 1903141632 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-9999
 1903141632 metadata/md5-cache/dev-cpp/tbb-2017.20161128
+1904110909 metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
 1903141632 metadata/md5-cache/dev-cpp/libcmis-0.5.2
 1904012309 metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
 1903141632 metadata/md5-cache/dev-cpp/libmcpp-2.7.2-r3
@@ -52798,7 +52694,7 @@
 1903141632 metadata/md5-cache/dev-cpp/sparsehash-2.0.3-r1
 1903212146 metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
 1903141632 metadata/md5-cache/dev-cpp/pangomm-2.42.0
-1904090009 metadata/md5-cache/dev-cpp/Manifest.gz
+1904110909 metadata/md5-cache/dev-cpp/Manifest.gz
 1903181339 metadata/md5-cache/dev-cpp/glibmm-2.58.1
 1903212146 metadata/md5-cache/dev-cpp/catch-2.3.0
 1904090009 metadata/md5-cache/dev-cpp/catch-2.5.0
@@ -52840,7 +52736,6 @@
 1903141632 metadata/md5-cache/dev-cpp/ETL-0.04.15
 1703011338 metadata/md5-cache/dev-cpp/libbinio-1.4-r1
 1903141632 metadata/md5-cache/dev-cpp/glog-0.3.5
-1903141632 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.1.1-r1
 1903141632 metadata/md5-cache/dev-cpp/tclap-1.2.1
 1903212309 metadata/md5-cache/dev-cpp/gtkmm-3.24.1
 1903141632 metadata/md5-cache/dev-cpp/waylandpp-0.2.4
@@ -52861,7 +52756,6 @@
 1903301309 metadata/md5-cache/app-office/libreoffice-l10n-6.2.2.2
 1904010139 metadata/md5-cache/app-office/grisbi-1.2.1
 1903212146 metadata/md5-cache/app-office/ledger-3.1.2
-1904031509 metadata/md5-cache/app-office/libreoffice-6.2.3.1
 1903141632 metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
 1903141632 metadata/md5-cache/app-office/moneydance-2017.10
 1903212146 metadata/md5-cache/app-office/gnumeric-1.12.39
@@ -52894,7 +52788,8 @@
 1904020009 metadata/md5-cache/app-office/libalkimia-7.0.2-r1
 1904061809 metadata/md5-cache/app-office/libreoffice-l10n-6.2.3.1
 1903212146 metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2
-1904071609 metadata/md5-cache/app-office/Manifest.gz
+1904111209 metadata/md5-cache/app-office/Manifest.gz
+1904111209 metadata/md5-cache/app-office/libreoffice-6.2.3.2
 1903212146 metadata/md5-cache/app-office/gnucash-3.3
 1805012209 metadata/md5-cache/app-office/ooextras-20060909
 1904020009 metadata/md5-cache/app-office/kraft-0.80
@@ -52906,6 +52801,7 @@
 1903212146 metadata/md5-cache/app-office/impressive-0.12.0
 1802051008 metadata/md5-cache/app-office/geierlein-0.10.0
 1903141632 metadata/md5-cache/app-office/homebank-5.1.8
+1904101439 metadata/md5-cache/app-office/gnucash-3.5
 1903141632 metadata/md5-cache/app-office/abiword-docs-3.0.2
 1903141632 metadata/md5-cache/app-office/texmacs-1.99.6-r2
 1902172109 metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.5.2
@@ -53249,7 +53145,7 @@
 1903141632 metadata/md5-cache/net-analyzer/zabbix-3.0.22
 1903141632 metadata/md5-cache/net-analyzer/vnstat-9999
 1903141632 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
-1904100009 metadata/md5-cache/net-analyzer/Manifest.gz
+1904102009 metadata/md5-cache/net-analyzer/Manifest.gz
 1903141632 metadata/md5-cache/net-analyzer/iftop-1.0_pre4-r2
 1805012209 metadata/md5-cache/net-analyzer/neti-2.0
 1903141632 metadata/md5-cache/net-analyzer/sinfo-0.0.48
@@ -53396,12 +53292,12 @@
 1903141632 metadata/md5-cache/net-analyzer/barnyard2-1.9-r2
 1903212146 metadata/md5-cache/net-analyzer/2ping-4.3
 1903141632 metadata/md5-cache/net-analyzer/mtr-0.87
-1904100009 metadata/md5-cache/net-analyzer/wireshark-3.0.1
+1904102009 metadata/md5-cache/net-analyzer/wireshark-3.0.1
 1903141632 metadata/md5-cache/net-analyzer/isic-0.07-r1
 1903141632 metadata/md5-cache/net-analyzer/mtr-9999
 1903141632 metadata/md5-cache/net-analyzer/yersinia-0.7.3
 1903141632 metadata/md5-cache/net-analyzer/tcptrack-1.4.2
-1904060039 metadata/md5-cache/net-analyzer/tcpreplay-4.3.2
+1904102009 metadata/md5-cache/net-analyzer/tcpreplay-4.3.2
 1902251540 metadata/md5-cache/net-analyzer/jffnms-0.9.4-r1
 1903141632 metadata/md5-cache/net-analyzer/pmacct-1.7.1-r1
 1808151104 metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
@@ -53916,7 +53812,6 @@
 1903141632 metadata/md5-cache/app-misc/geneweb-6.08-r1
 1903141632 metadata/md5-cache/app-misc/jq-1.5-r3
 1708211108 metadata/md5-cache/app-misc/unfoo-1.0.8
-1903212146 metadata/md5-cache/app-misc/tracker-1.12.4-r1
 1903212146 metadata/md5-cache/app-misc/solaar-0.9.2-r3
 1903141632 metadata/md5-cache/app-misc/fdupes-1.6.1-r1
 1903141632 metadata/md5-cache/app-misc/actkbd-0.2.8-r2
@@ -54003,7 +53898,7 @@
 1903141632 metadata/md5-cache/app-misc/elasticsearch-6.6.1
 1809180947 metadata/md5-cache/app-misc/screenfetch-9999
 1903141632 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
-1904100639 metadata/md5-cache/app-misc/Manifest.gz
+1904101539 metadata/md5-cache/app-misc/Manifest.gz
 1903141632 metadata/md5-cache/app-misc/socnetv-2.2
 1903212146 metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r1
 1903141632 metadata/md5-cache/app-misc/mmv-1.01b_p18
@@ -54022,7 +53917,6 @@
 1903141632 metadata/md5-cache/app-misc/glcdprocdriver-0.0.6
 1903141632 metadata/md5-cache/app-misc/ps3pf_utils-2.3
 1903212146 metadata/md5-cache/app-misc/golly-2.7-r1
-1903141632 metadata/md5-cache/app-misc/bijiben-3.26.1
 1903202339 metadata/md5-cache/app-misc/pdfpc-4.3.2
 1903141632 metadata/md5-cache/app-misc/ddccontrol-db-20061014_p20121105
 1705031008 metadata/md5-cache/app-misc/rlwrap-0.42-r1
@@ -54288,23 +54182,23 @@
 1903141632 metadata/md5-cache/net-voip/yate-9999
 1903212146 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
 1903212146 metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
+1904110439 metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.75_beta
 1903141632 metadata/md5-cache/www-plugins/lightspark-9999
 1712242039 metadata/md5-cache/www-plugins/pdfjs-1.9.426
-1903301639 metadata/md5-cache/www-plugins/chrome-binary-plugins-74.0.3729.40_beta
 1904101109 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.171
 1903141632 metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
 1903212146 metadata/md5-cache/www-plugins/passff-host-1.1.0
 1903141632 metadata/md5-cache/www-plugins/mozplugger-2.1.6
 1903141632 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.7
-1903210309 metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.86
 1903141632 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r2
 1902072239 metadata/md5-cache/www-plugins/browserpass-2.0.13
 1903141632 metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
-1904101109 metadata/md5-cache/www-plugins/Manifest.gz
+1904110439 metadata/md5-cache/www-plugins/Manifest.gz
+1904110439 metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3683.103
 1903141632 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9
 1902170139 metadata/md5-cache/www-plugins/passff-1.6.3
-1903301639 metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3745.4_alpha
 1902072239 metadata/md5-cache/www-plugins/browserpass-2.0.22
+1904110439 metadata/md5-cache/www-plugins/chrome-binary-plugins-75.0.3759.4_alpha
 1903141632 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.5-r3
 1903141632 metadata/md5-cache/www-plugins/lightspark-0.8.1
 1903141632 metadata/md5-cache/www-plugins/google-talkplugin-9999
@@ -54315,6 +54209,7 @@
 1903141632 metadata/md5-cache/media-radio/direwolf-1.4
 1812122009 metadata/md5-cache/media-radio/fldigi-4.0.18
 1903141632 metadata/md5-cache/media-radio/flamp-2.2.03
+1904101739 metadata/md5-cache/media-radio/wsjtx-2.0.1
 1903280609 metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
 1901311009 metadata/md5-cache/media-radio/fldigi-4.1.00
 1903141632 metadata/md5-cache/media-radio/svxlink-17.12.1
@@ -54336,7 +54231,7 @@
 1903141632 metadata/md5-cache/media-radio/xwxapt-3.2
 1903141632 metadata/md5-cache/media-radio/tucnak-4.14
 1903141632 metadata/md5-cache/media-radio/tlf-1.3.2
-1904010239 metadata/md5-cache/media-radio/Manifest.gz
+1904101739 metadata/md5-cache/media-radio/Manifest.gz
 1903141632 metadata/md5-cache/media-radio/qrq-0.3.1
 1903141632 metadata/md5-cache/media-radio/cqrlog-2.3.0
 1903141632 metadata/md5-cache/media-radio/xwxapt-3.3
@@ -54387,12 +54282,12 @@
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-cputransp-1.0.9
 1903141632 metadata/md5-cache/dev-embedded/parapin-1.0.0
 1903141632 metadata/md5-cache/dev-embedded/tavrasm-1.22-r1
-1903212146 metadata/md5-cache/dev-embedded/platformio-3.6.4
 1903141632 metadata/md5-cache/dev-embedded/avr-libc-2.0.0
 1805012209 metadata/md5-cache/dev-embedded/upslug2-11
 1903141632 metadata/md5-cache/dev-embedded/icdprog-0.5
 1903141632 metadata/md5-cache/dev-embedded/picasm-1.14
 1903141632 metadata/md5-cache/dev-embedded/tigcc-0.96_beta7
+1904101439 metadata/md5-cache/dev-embedded/platformio-3.6.6
 1903141632 metadata/md5-cache/dev-embedded/libjaylink-9999
 1903141632 metadata/md5-cache/dev-embedded/sdcc-9999
 1903141632 metadata/md5-cache/dev-embedded/libftd2xx-1.1.12-r1
@@ -54426,7 +54321,7 @@
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-perl-1.0.5
 1903141632 metadata/md5-cache/dev-embedded/zmac-1.3
 1903141632 metadata/md5-cache/dev-embedded/smdk-dltool-0.20-r4
-1903301939 metadata/md5-cache/dev-embedded/Manifest.gz
+1904101439 metadata/md5-cache/dev-embedded/Manifest.gz
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-doctools-1.0.9
 1805012209 metadata/md5-cache/dev-embedded/scratchbox-devkit-perl-1.0.4
 1805012209 metadata/md5-cache/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58
@@ -55399,7 +55294,7 @@
 1903212146 metadata/md5-cache/app-text/paperwork-backend-1.2.4
 1903141632 metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1
 1903141632 metadata/md5-cache/app-text/ding-1.8.1
-1904100809 metadata/md5-cache/app-text/Manifest.gz
+1904101539 metadata/md5-cache/app-text/Manifest.gz
 1903141632 metadata/md5-cache/app-text/writerperfect-0.9.5
 1805012209 metadata/md5-cache/app-text/vlna-1.5
 1903141632 metadata/md5-cache/app-text/htp-1.19
@@ -55485,7 +55380,6 @@
 1903141632 metadata/md5-cache/app-text/active-dvi-1.10.2-r1
 1903212146 metadata/md5-cache/app-text/gtranslator-3.30.1
 1903141632 metadata/md5-cache/app-text/highlight-3.42-r1
-1903141632 metadata/md5-cache/app-text/libgepub-0.4
 1903212146 metadata/md5-cache/app-text/mftrace-1.2.19-r1
 1803271139 metadata/md5-cache/app-text/convmv-2.04
 1702282309 metadata/md5-cache/app-text/cpdf-2.1.1-r1
@@ -56034,6 +55928,7 @@
 1903151709 metadata/md5-cache/www-apps/nextcloud-15.0.5
 1903141632 metadata/md5-cache/www-apps/grafana-bin-5.4.3-r1
 1903141632 metadata/md5-cache/www-apps/jekyll-sitemap-0.11.0
+1904101639 metadata/md5-cache/www-apps/piwigo-2.9.5
 1903141632 metadata/md5-cache/www-apps/mod_survey-3.2.5
 1903141632 metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
 1903141632 metadata/md5-cache/www-apps/gitit-0.12.1.1
@@ -56069,6 +55964,7 @@
 1903212146 metadata/md5-cache/www-apps/novnc-0.6.2-r1
 1903092239 metadata/md5-cache/www-apps/moodle-3.5.5
 1903141632 metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
+1904120009 metadata/md5-cache/www-apps/netbox-2.5.10
 1902211339 metadata/md5-cache/www-apps/groupoffice-4.0.97
 1903141632 metadata/md5-cache/www-apps/jekyll-3.6.2
 1903141632 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
@@ -56090,7 +55986,7 @@
 1902251540 metadata/md5-cache/www-apps/postfixadmin-3.1
 1902211339 metadata/md5-cache/www-apps/ampache-3.8.3
 1903141632 metadata/md5-cache/www-apps/hugo-0.48
-1904091539 metadata/md5-cache/www-apps/Manifest.gz
+1904120009 metadata/md5-cache/www-apps/Manifest.gz
 1903212146 metadata/md5-cache/www-apps/scgi-1.14-r1
 1903192009 metadata/md5-cache/www-apps/zeppelin-bin-0.8.1
 1903242209 metadata/md5-cache/www-apps/icingaweb2-module-director-9999
@@ -56180,6 +56076,7 @@
 1903212146 metadata/md5-cache/www-apps/nikola-7.8.15-r1
 1903141632 metadata/md5-cache/www-apps/owncloud-10.0.10
 1903141632 metadata/md5-cache/www-apps/sitebar-3.3.9-r2
+1904101209 metadata/md5-cache/www-apps/grafana-bin-6.1.3
 1903212146 metadata/md5-cache/www-apps/trac-accountmanager-0.4.4
 1903141632 metadata/md5-cache/www-apps/hugo-0.44
 1903222309 metadata/md5-cache/www-apps/drupal-8.5.14
@@ -56433,7 +56330,7 @@
 1903141632 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1903141632 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1903141632 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1
-1904101109 metadata/md5-cache/Manifest.gz
+1904120009 metadata/md5-cache/Manifest.gz
 1903212146 metadata/md5-cache/gui-wm/sway-9999
 1904100809 metadata/md5-cache/gui-wm/Manifest.gz
 1903212146 metadata/md5-cache/gui-wm/sway-1.0_rc5
@@ -56710,9 +56607,9 @@
 1903212146 metadata/md5-cache/dev-util/redo-0.31
 1801060109 metadata/md5-cache/dev-util/cppi-1.18
 1903141632 metadata/md5-cache/dev-util/weka-3.8.0
-1903202209 metadata/md5-cache/dev-util/cucumber-3.0.2-r1
 1901291809 metadata/md5-cache/dev-util/idea-community-2018.3.3.183.5153.38
 1903141632 metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
+1904111439 metadata/md5-cache/dev-util/drone-cli-1.0.8
 1903221339 metadata/md5-cache/dev-util/clazy-1.5
 1901161439 metadata/md5-cache/dev-util/debootstrap-1.0.114
 1903141632 metadata/md5-cache/dev-util/google-perftools-2.6.2
@@ -56849,11 +56746,9 @@
 1903141632 metadata/md5-cache/dev-util/dropwatch-1.4-r1
 1903141632 metadata/md5-cache/dev-util/lttng-ust-2.10.1
 1903212146 metadata/md5-cache/dev-util/d-feet-0.3.14
-1903141632 metadata/md5-cache/dev-util/debugedit-4.14.2
 1903141632 metadata/md5-cache/dev-util/cucumber-expressions-5.0.18
 1903212146 metadata/md5-cache/dev-util/catalyst-3.0.3
 1903141632 metadata/md5-cache/dev-util/dirdiff-2.1-r3
-1903141632 metadata/md5-cache/dev-util/cucumber-rails-1.5.0
 1809230009 metadata/md5-cache/dev-util/shflags-1.2.3
 1902171909 metadata/md5-cache/dev-util/ccache-3.3.4-r1
 1709052039 metadata/md5-cache/dev-util/abi-dumper-1.1
@@ -56879,7 +56774,7 @@
 1903141632 metadata/md5-cache/dev-util/duma-2.5.13
 1903141632 metadata/md5-cache/dev-util/valgrind-3.14.0
 1903141632 metadata/md5-cache/dev-util/ltrace-0.7.3
-1903141632 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.0
+1904110809 metadata/md5-cache/dev-util/repo-1.13.2
 1903141632 metadata/md5-cache/dev-util/lttng-tools-2.10.5
 1903141632 metadata/md5-cache/dev-util/cmake-3.12.3
 1903212146 metadata/md5-cache/dev-util/redo-99999
@@ -56990,7 +56885,7 @@
 1903141632 metadata/md5-cache/dev-util/ragel-6.9
 1903021239 metadata/md5-cache/dev-util/cflow-1.6
 1903141632 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1904100539 metadata/md5-cache/dev-util/Manifest.gz
+1904112109 metadata/md5-cache/dev-util/Manifest.gz
 1903212146 metadata/md5-cache/dev-util/xdelta-3.1.0
 1903141632 metadata/md5-cache/dev-util/dmake-4.12.2
 1903141632 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -57024,7 +56919,6 @@
 1903141632 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-8.0.44
 1903141632 metadata/md5-cache/dev-util/appdata-tools-0.1.7
 1903141632 metadata/md5-cache/dev-util/netbeans-8.2
-1702282322 metadata/md5-cache/dev-util/hxtools-20121125-r1
 1903141632 metadata/md5-cache/dev-util/kcov-34
 1904020009 metadata/md5-cache/dev-util/kdevelop-php-5.3.2
 1903141632 metadata/md5-cache/dev-util/nvidia-cuda-sdk-9.2.88
@@ -57124,7 +57018,7 @@
 1903212146 metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
 1903141632 metadata/md5-cache/dev-util/codeblocks-9999
 1901161209 metadata/md5-cache/dev-util/shellcheck-bin-0.6.0
-1904100539 metadata/md5-cache/dev-util/meson-0.49.2
+1904102009 metadata/md5-cache/dev-util/meson-0.49.2
 1802072238 metadata/md5-cache/dev-util/patchbin-20160208
 1903141632 metadata/md5-cache/dev-util/lockrun-20120508-r1
 1903141632 metadata/md5-cache/dev-util/lttng-ust-2.8.1
@@ -57210,7 +57104,6 @@
 1903141632 metadata/md5-cache/dev-util/android-sdk-update-manager-22
 1903141632 metadata/md5-cache/dev-util/ragel-6.7-r1
 1903141632 metadata/md5-cache/dev-util/debhelper-12.1.1
-1903141632 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
 1903141632 metadata/md5-cache/dev-util/elfkickers-3.1
 1903141632 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.0.176
 1903141632 metadata/md5-cache/dev-util/igprof-5.9.11
@@ -59349,6 +59242,7 @@
 1903212146 metadata/md5-cache/app-admin/dxf-7.5.0
 1903141632 metadata/md5-cache/app-admin/lsyncd-2.2.2
 1903141632 metadata/md5-cache/app-admin/logrotate-3.9.1
+1904112009 metadata/md5-cache/app-admin/keepassxc-2.4.0-r1
 1903141632 metadata/md5-cache/app-admin/conky-1.10.8-r4
 1902072239 metadata/md5-cache/app-admin/certmgr-1.6.0
 1903111409 metadata/md5-cache/app-admin/restart-services-0.14.4
@@ -59393,7 +59287,7 @@
 1903141632 metadata/md5-cache/app-admin/consolehm-1.31
 1903101739 metadata/md5-cache/app-admin/terraform-0.11.12
 1903141632 metadata/md5-cache/app-admin/puppet-4.10.12
-1904100839 metadata/md5-cache/app-admin/Manifest.gz
+1904112009 metadata/md5-cache/app-admin/Manifest.gz
 1903212146 metadata/md5-cache/app-admin/diamond-9999
 1903141632 metadata/md5-cache/app-admin/fluentd-1.2.6-r1
 1702282308 metadata/md5-cache/app-admin/gentoo-perl-helpers-0.2.1
@@ -59446,6 +59340,7 @@
 1903212146 metadata/md5-cache/app-admin/diamond-4.0-r1
 1903141632 metadata/md5-cache/app-admin/multilog-watch-1.12-r1
 1902241509 metadata/md5-cache/app-admin/restart-services-0.14.1
+1904110039 metadata/md5-cache/app-admin/glance-18.0.0
 1903141632 metadata/md5-cache/app-admin/apg-2.3.0b-r7
 1903141632 metadata/md5-cache/app-admin/prelude-manager-3.1.0
 1903141632 metadata/md5-cache/app-admin/kubectx-0.5.0
@@ -59461,6 +59356,7 @@
 1903141632 metadata/md5-cache/app-admin/fsvs-1.2.5-r2
 1903141632 metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
 1903141632 metadata/md5-cache/app-admin/cpulimit-2.2
+1904110139 metadata/md5-cache/app-admin/supervisor-4.0.1
 1903141632 metadata/md5-cache/app-admin/389-console-1.1.7-r1
 1902251540 metadata/md5-cache/app-admin/tenshi-0.17
 1902072239 metadata/md5-cache/app-admin/mtail-3.0.0_rc5
@@ -59957,6 +59853,7 @@
 1903141632 metadata/md5-cache/mail-mta/netqmail-1.06-r5
 1903141632 metadata/md5-cache/mail-mta/nullmailer-1.13-r5
 1903291609 metadata/md5-cache/mail-mta/postfix-3.2.4
+1904102139 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4
 1903141632 metadata/md5-cache/mail-mta/courier-0.75.0
 1903141632 metadata/md5-cache/mail-mta/courier-0.78.2
 1903291609 metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1-r1
@@ -59964,7 +59861,7 @@
 1903141632 metadata/md5-cache/mail-mta/courier-0.76.4
 1903291609 metadata/md5-cache/mail-mta/postfix-3.3.3
 1903291609 metadata/md5-cache/mail-mta/postfix-3.4.3
-1904090839 metadata/md5-cache/mail-mta/Manifest.gz
+1904102139 metadata/md5-cache/mail-mta/Manifest.gz
 1903141632 metadata/md5-cache/mail-mta/nullmailer-2.0-r1
 1903092239 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.3
 1903141632 metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
@@ -60010,12 +59907,12 @@
 1903141632 metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.3
 1904080039 metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.2
 1903141632 metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.4.0
-1904091939 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
+1904101139 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.5
 1904091739 metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1
 1903141632 metadata/md5-cache/xfce-extra/eatmonkey-0.1.4-r1
 1903141632 metadata/md5-cache/xfce-extra/xfce4-wmdock-plugin-0.6.0
 1903141632 metadata/md5-cache/xfce-extra/xfce4-linelight-plugin-0.1.7-r1
-1904091939 metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
+1904101139 metadata/md5-cache/xfce-extra/xfdashboard-0.6.1
 1903141632 metadata/md5-cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
 1903141632 metadata/md5-cache/xfce-extra/xfdashboard-0.4.0
 1903141632 metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.0
@@ -60029,7 +59926,7 @@
 1807101539 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.0
 1903141632 metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
 1903141632 metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1-r1
-1904092009 metadata/md5-cache/xfce-extra/Manifest.gz
+1904101139 metadata/md5-cache/xfce-extra/Manifest.gz
 1903141632 metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2
 1807101539 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.2.1-r1
 1904091939 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r4
@@ -60053,7 +59950,7 @@
 1903141632 metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.1
 1901212309 metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
 1903141632 metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.1
-1904091939 metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
+1904101139 metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
 1903141632 metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.0
 1903141632 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
 1903141632 metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92
@@ -60064,8 +59961,8 @@
 1903141632 metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
 1903141632 metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.1
 1904091939 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r6
-1904091939 metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
-1904091739 metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
+1904101139 metadata/md5-cache/xfce-extra/xfdashboard-0.7.5
+1904101139 metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
 1904080109 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r1
 1904071809 metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.1
 1812021439 metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r1
@@ -60111,7 +60008,7 @@
 1903141632 metadata/md5-cache/sci-mathematics/prover9-2009.11a
 1903212146 metadata/md5-cache/sci-mathematics/pymc-2.3.6
 1903141632 metadata/md5-cache/sci-mathematics/octave-4.2.2
-1903212146 metadata/md5-cache/sci-mathematics/z3-4.4.1
+1904102109 metadata/md5-cache/sci-mathematics/z3-4.4.1
 1903212146 metadata/md5-cache/sci-mathematics/z3-4.8.4
 1903212146 metadata/md5-cache/sci-mathematics/Macaulay2-1.8.2.1-r1
 1903141632 metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
@@ -60179,7 +60076,7 @@
 1903141632 metadata/md5-cache/sci-mathematics/polymake-3.0_p2
 1903212146 metadata/md5-cache/sci-mathematics/factmsieve-76-r1
 1903141632 metadata/md5-cache/sci-mathematics/pari-2.9.4-r1
-1904081739 metadata/md5-cache/sci-mathematics/Manifest.gz
+1904102109 metadata/md5-cache/sci-mathematics/Manifest.gz
 1903141632 metadata/md5-cache/sci-mathematics/jags-4.0.0
 1808151104 metadata/md5-cache/sci-mathematics/nauty-2.5.9
 1903141632 metadata/md5-cache/sci-mathematics/yacas-1.6.1-r1
@@ -60240,7 +60137,6 @@
 1903141632 metadata/md5-cache/sci-mathematics/genius-1.0.23
 1903141632 metadata/md5-cache/sci-mathematics/calc-2.12.4.13-r1
 1903141632 metadata/md5-cache/app-portage/hackport-0.5.2
-1903141632 metadata/md5-cache/app-portage/eix-0.33.5
 1903212146 metadata/md5-cache/app-portage/gs-elpa-0.1.3
 1903141632 metadata/md5-cache/app-portage/hackport-0.5.6
 1903212146 metadata/md5-cache/app-portage/pfl-3.0-r2
@@ -60280,7 +60176,6 @@
 1903141632 metadata/md5-cache/app-portage/genlop-9999
 1903212146 metadata/md5-cache/app-portage/gemato-14.0
 1903141632 metadata/md5-cache/app-portage/portage-utils-0.74
-1903221339 metadata/md5-cache/app-portage/pram-2-r1
 1903212146 metadata/md5-cache/app-portage/tatt-9999
 1903212146 metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
 1903212146 metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
@@ -60325,7 +60220,7 @@
 1903212146 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
 1903212146 metadata/md5-cache/app-portage/elogviewer-2.9
 1903212146 metadata/md5-cache/app-portage/elogviewer-2.7-r2
-1904090139 metadata/md5-cache/app-portage/Manifest.gz
+1904101839 metadata/md5-cache/app-portage/Manifest.gz
 1903212146 metadata/md5-cache/app-portage/portpeek-2.1.27
 1903141632 metadata/md5-cache/app-portage/g-cpan-0.16.5
 1903212146 metadata/md5-cache/app-portage/elogv-0.7.6.5
@@ -60387,7 +60282,7 @@
 1903212146 metadata/md5-cache/app-portage/gentoopm-0.3.0
 1903212146 metadata/md5-cache/app-portage/gs-elpa-9999
 1903212146 metadata/md5-cache/app-portage/smart-live-rebuild-9999
-1904090139 metadata/md5-cache/app-portage/eix-0.33.7
+1904101739 metadata/md5-cache/app-portage/eix-0.33.7
 1702282309 metadata/md5-cache/app-portage/euses-2.5.9
 1903141632 metadata/md5-cache/app-portage/deltup-0.4.6-r1
 1903212146 metadata/md5-cache/app-portage/distpatch-0.1.2-r1
@@ -60501,7 +60396,6 @@
 1903141632 metadata/md5-cache/media-sound/vlevel-0.5-r1
 1903141632 metadata/md5-cache/media-sound/dcadec-0.2.0
 1903141632 metadata/md5-cache/media-sound/herrie-2.2-r1
-1903212146 metadata/md5-cache/media-sound/gnome-music-3.24.2
 1902112049 metadata/md5-cache/media-sound/teamspeak-client-3.2.3
 1903141632 metadata/md5-cache/media-sound/bristol-0.60.11-r1
 1904020009 metadata/md5-cache/media-sound/audex-0.95_pre20190112
@@ -60625,7 +60519,7 @@
 1903141632 metadata/md5-cache/media-sound/gramofile-1.6_p9
 1903141632 metadata/md5-cache/media-sound/mp3c-0.31-r1
 1903141632 metadata/md5-cache/media-sound/jtagger-1.0-r1
-1903311409 metadata/md5-cache/media-sound/lmms-9999
+1904111239 metadata/md5-cache/media-sound/lmms-9999
 1903141632 metadata/md5-cache/media-sound/tagtool-0.12.3-r1
 1903212146 metadata/md5-cache/media-sound/rhythmbox-3.4.2
 1903212146 metadata/md5-cache/media-sound/codecgraph-20120114-r2
@@ -60703,7 +60597,7 @@
 1903212146 metadata/md5-cache/media-sound/gtklick-0.6.4
 1903141632 metadata/md5-cache/media-sound/musepack-tools-465-r1
 1903141632 metadata/md5-cache/media-sound/sc2mpd-1.1.5
-1903311409 metadata/md5-cache/media-sound/lmms-1.2.0_rc8
+1904111239 metadata/md5-cache/media-sound/lmms-1.2.0_rc8
 1903141632 metadata/md5-cache/media-sound/id3ted-1.0
 1903141632 metadata/md5-cache/media-sound/gnump3d-3.0-r1
 1702282327 metadata/md5-cache/media-sound/podget-0.8.2
@@ -60732,7 +60626,7 @@
 1904071809 metadata/md5-cache/media-sound/pragha-1.3.4
 1702282327 metadata/md5-cache/media-sound/gst123-0.3.4
 1903141632 metadata/md5-cache/media-sound/pulseaudio-12.2
-1904100039 metadata/md5-cache/media-sound/Manifest.gz
+1904111239 metadata/md5-cache/media-sound/Manifest.gz
 1903141632 metadata/md5-cache/media-sound/mpg123-1.25.10-r1
 1903141632 metadata/md5-cache/media-sound/id3ed-1.10.4
 1903141632 metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
@@ -60787,7 +60681,7 @@
 1903280309 metadata/md5-cache/media-sound/playerctl-2.0.2
 1903212146 metadata/md5-cache/media-sound/jalv-1.6.0-r2
 1805012209 metadata/md5-cache/media-sound/mplay-0.80
-1904090139 metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
+1904110109 metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
 1903141632 metadata/md5-cache/media-sound/ripperx-2.7.3
 1903141632 metadata/md5-cache/media-sound/pianobar-9999
 1903141632 metadata/md5-cache/media-sound/peercast-0.1218-r2
@@ -61199,7 +61093,6 @@
 1903141632 metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
 1903141632 metadata/md5-cache/sys-fs/copyfs-1.0.1-r1
 1902091909 metadata/md5-cache/sys-fs/ncdu-1.14
-1903150339 metadata/md5-cache/sys-fs/vhba-20170610
 1903141632 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
 1903141632 metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
 1903141632 metadata/md5-cache/sys-fs/snapraid-6.2
@@ -61217,6 +61110,7 @@
 1903212146 metadata/md5-cache/sys-fs/udev-241
 1710290939 metadata/md5-cache/sys-fs/rar2fs-1.26.0
 1904091509 metadata/md5-cache/sys-fs/udisks-2.8.2
+1904101509 metadata/md5-cache/sys-fs/squashfs-tools-4.3_p12
 1702282333 metadata/md5-cache/sys-fs/mp3fs-0.91
 1904012309 metadata/md5-cache/sys-fs/fuse-exfat-1.3.0
 1903141632 metadata/md5-cache/sys-fs/encfs-1.9.5
@@ -61243,7 +61137,7 @@
 1903141632 metadata/md5-cache/sys-fs/fuse-zip-0.4.5
 1903220039 metadata/md5-cache/sys-fs/f2fs-tools-1.12.0-r1
 1903141632 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1904100839 metadata/md5-cache/sys-fs/Manifest.gz
+1904101839 metadata/md5-cache/sys-fs/Manifest.gz
 1903220009 metadata/md5-cache/sys-fs/fuse-3.4.2
 1903141632 metadata/md5-cache/sys-fs/mac-fdisk-0.1_p18
 1903141632 metadata/md5-cache/sys-fs/libeatmydata-82
@@ -63783,6 +63677,7 @@
 1903212146 metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
 1903212146 metadata/md5-cache/sys-cluster/charm-6.6.0-r1
 1903141632 metadata/md5-cache/sys-cluster/corosync-1.3.5
+1904110209 metadata/md5-cache/sys-cluster/cinder-2019.1.9999
 1903260039 metadata/md5-cache/sys-cluster/nova-18.2.0
 1903141632 metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
 1903141632 metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
@@ -63820,6 +63715,7 @@
 1903190209 metadata/md5-cache/sys-cluster/legion-17.02.0
 1902251540 metadata/md5-cache/sys-cluster/kube-scheduler-1.10.12
 1903212146 metadata/md5-cache/sys-cluster/charm-6.5.1-r3
+1904111439 metadata/md5-cache/sys-cluster/kubeadm-1.14.1
 1903141632 metadata/md5-cache/sys-cluster/corosync-2.3.4-r1
 1903141632 metadata/md5-cache/sys-cluster/resource-agents-3.9.6
 1903141632 metadata/md5-cache/sys-cluster/libqb-1.0.1
@@ -63886,12 +63782,13 @@
 1903212146 metadata/md5-cache/sys-cluster/polysh-0.4-r1
 1903212146 metadata/md5-cache/sys-cluster/hpx-1.1.0
 1903212146 metadata/md5-cache/sys-cluster/charm-6.5.1-r2
+1904111439 metadata/md5-cache/sys-cluster/kubelet-1.14.1
 1903212146 metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
 1903212146 metadata/md5-cache/sys-cluster/singularity-2.4.2
 1902251540 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.12
 1904091539 metadata/md5-cache/sys-cluster/teleport-3.2.0
 1903141632 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
-1904091539 metadata/md5-cache/sys-cluster/Manifest.gz
+1904111439 metadata/md5-cache/sys-cluster/Manifest.gz
 1903141632 metadata/md5-cache/sys-cluster/cman-lib-2.03.09-r1
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
 1903261909 metadata/md5-cache/sys-cluster/cinder-13.0.4
@@ -63976,6 +63873,7 @@
 1902251540 metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.5
 1903141632 metadata/md5-cache/sys-cluster/util-vserver-0.30.216_pre3120
 1904050039 metadata/md5-cache/sys-cluster/gasnet-1.28.2
+1904110209 metadata/md5-cache/sys-cluster/cinder-14.0.0
 1903141632 metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
 1805012209 metadata/md5-cache/sys-cluster/c3-4.0.1
 1806232209 metadata/md5-cache/sys-cluster/ucx-1.3.0
@@ -64258,6 +64156,7 @@
 1903250709 metadata/md5-cache/x11-libs/libXres-1.2.0-r1
 1903141632 metadata/md5-cache/x11-libs/qscintilla-2.10.8
 1903172239 metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1
+1904102039 metadata/md5-cache/x11-libs/pixman-0.38.4
 1903141632 metadata/md5-cache/x11-libs/xapps-1.0.4
 1903141632 metadata/md5-cache/x11-libs/pango-1.42.4
 1903141632 metadata/md5-cache/x11-libs/wxGTK-3.0.4
@@ -64354,7 +64253,7 @@
 1903141632 metadata/md5-cache/x11-libs/gtkglarea-2.1.0
 1903141632 metadata/md5-cache/x11-libs/libfm-9999
 1903141632 metadata/md5-cache/x11-libs/motif-2.3.8-r1
-1904091139 metadata/md5-cache/x11-libs/Manifest.gz
+1904112239 metadata/md5-cache/x11-libs/Manifest.gz
 1804221708 metadata/md5-cache/x11-libs/fox-wrapper-2
 1903141632 metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
 1903250709 metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1
@@ -64367,10 +64266,9 @@
 1810202209 metadata/md5-cache/x11-libs/scw-0.4.7-r1
 1903141632 metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
 1903141632 metadata/md5-cache/x11-libs/libyui-3.3.3
-1904080009 metadata/md5-cache/x11-libs/pixman-0.38.2
 1903141632 metadata/md5-cache/x11-libs/libva-intel-media-driver-18.3.0
 1904080039 metadata/md5-cache/x11-libs/libfontenc-1.1.4
-1806092239 metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
+1904112239 metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
 1903141632 metadata/md5-cache/x11-libs/agg-2.5-r3
 1903172239 metadata/md5-cache/x11-libs/libXpm-3.5.12-r1
 1903250709 metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2
@@ -64414,7 +64312,6 @@
 1903250709 metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1
 1903141632 metadata/md5-cache/x11-libs/libaosd-0.2.7
 1903141632 metadata/md5-cache/x11-libs/libva-intel-driver-2.1.0
-1903212146 metadata/md5-cache/x11-libs/pixman-0.38.0
 1903141632 metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
 1903141632 metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
 1903141632 metadata/md5-cache/x11-libs/goocanvas-1.0.0
@@ -65206,7 +65103,6 @@
 1902072239 metadata/md5-cache/net-dns/coredns-1.3.0
 1903141632 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 1903141632 metadata/md5-cache/net-dns/idnkit-2.3
-1903141632 metadata/md5-cache/net-dns/pdns-recursor-4.1.10
 1904091609 metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
 1904011039 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.22
 1903141632 metadata/md5-cache/net-dns/libidn2-2.0.4
@@ -65224,7 +65120,7 @@
 1903141632 metadata/md5-cache/net-dns/libidn-1.33-r99
 1903212146 metadata/md5-cache/net-dns/dnsimple-dyndns-0.1
 1903141632 metadata/md5-cache/net-dns/djbdns-1.05-r32
-1904080909 metadata/md5-cache/net-dns/libidn2-2.1.1a
+1904101809 metadata/md5-cache/net-dns/libidn2-2.1.1a
 1903141632 metadata/md5-cache/net-dns/ddclient-3.9.0-r1
 1903141632 metadata/md5-cache/net-dns/c-ares-1.14.0
 1903141632 metadata/md5-cache/net-dns/mydns-1.2.8.31-r1
@@ -65246,7 +65142,7 @@
 1903150439 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.21
 1702282328 metadata/md5-cache/net-dns/dnswalk-2.0.2
 1903141632 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
-1904091609 metadata/md5-cache/net-dns/Manifest.gz
+1904112009 metadata/md5-cache/net-dns/Manifest.gz
 1903141632 metadata/md5-cache/net-dns/libidn-1.33-r2
 1903190509 metadata/md5-cache/net-dns/ddclient-3.9.0-r2
 1903141632 metadata/md5-cache/net-dns/dnssec-validator-2.2-r1
@@ -66851,7 +66747,7 @@
 1901021339 metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
 1903141632 metadata/md5-cache/perl-core/Data-Dumper-2.154.0
 1903141632 metadata/md5-cache/perl-core/ExtUtils-Manifest-1.700.0
-1904082209 metadata/md5-cache/perl-core/Manifest.gz
+1904110109 metadata/md5-cache/perl-core/Manifest.gz
 1903141632 metadata/md5-cache/perl-core/Digest-MD5-2.530.0
 1903141632 metadata/md5-cache/perl-core/Dumpvalue-1.170.0
 1903141632 metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
@@ -66866,7 +66762,7 @@
 1903141632 metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
 1812230010 metadata/md5-cache/perl-core/Math-BigInt-1.999.806
 1903141632 metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
-1904082209 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
+1904110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
 1903141632 metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
 1903141632 metadata/md5-cache/perl-core/podlators-2.5.3
 1903141632 metadata/md5-cache/perl-core/Module-Metadata-1.0.26
@@ -67029,7 +66925,7 @@
 1903141632 metadata/md5-cache/games-arcade/vor-0.5.7-r1
 1903141632 metadata/md5-cache/games-arcade/commandergenius-1.8.3
 1903141632 metadata/md5-cache/games-arcade/jumpnbump-1.50-r2
-1904080209 metadata/md5-cache/games-arcade/Manifest.gz
+1904112209 metadata/md5-cache/games-arcade/Manifest.gz
 1903141632 metadata/md5-cache/games-arcade/savagewheels-1.6.1-r1
 1903141632 metadata/md5-cache/games-arcade/conveysdl-1.3-r1
 1903141632 metadata/md5-cache/games-arcade/xgalaga-2.1.1.0
@@ -67080,7 +66976,7 @@
 1808091800 metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1
 1903141632 metadata/md5-cache/games-arcade/tuxdash-0.8-r1
 1903141632 metadata/md5-cache/games-arcade/nibbles-0.0.4
-1903141632 metadata/md5-cache/games-arcade/performous-1.1-r1
+1904112209 metadata/md5-cache/games-arcade/performous-1.1-r1
 1804151239 metadata/md5-cache/games-arcade/aop-0.6-r1
 1903141632 metadata/md5-cache/dev-dotnet/flickrnet-bin-2.2-r1
 1903141632 metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2
@@ -67437,7 +67333,7 @@
 1903141632 metadata/md5-cache/net-misc/mindterm-3.4
 1903141632 metadata/md5-cache/net-misc/openssh-blacklist-0.4.1
 1903141632 metadata/md5-cache/net-misc/vinagre-3.22.0-r3
-1904070309 metadata/md5-cache/net-misc/youtube-dl-2019.04.07
+1904101309 metadata/md5-cache/net-misc/youtube-dl-2019.04.07
 1903212146 metadata/md5-cache/net-misc/ntpsec-1.0.0-r6
 1903141632 metadata/md5-cache/net-misc/rancid-git-2.3.8
 1903212146 metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
@@ -67448,7 +67344,6 @@
 1903141632 metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r2
 1903141632 metadata/md5-cache/net-misc/portfwd-0.29-r1
 1903141632 metadata/md5-cache/net-misc/sipsak-0.9.6_p1-r2
-1904050839 metadata/md5-cache/net-misc/miniupnpd-2.1.20190403
 1903141632 metadata/md5-cache/net-misc/teamviewer-14.1.9025
 1904100939 metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
 1808151104 metadata/md5-cache/net-misc/s6-networking-2.3.0.2
@@ -67463,7 +67358,6 @@
 1903141632 metadata/md5-cache/net-misc/modemmanager-1.8.2
 1903141632 metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
 1710031639 metadata/md5-cache/net-misc/spiped-1.6.0-r1
-1904061239 metadata/md5-cache/net-misc/youtube-dl-2019.04.01
 1903141632 metadata/md5-cache/net-misc/ser2net-2.7-r1
 1902072239 metadata/md5-cache/net-misc/drive-0.3.9.1
 1811071339 metadata/md5-cache/net-misc/sgopherd-18.08
@@ -67562,7 +67456,6 @@
 1903141632 metadata/md5-cache/net-misc/gwget-1.0.4
 1903141632 metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
 1903141632 metadata/md5-cache/net-misc/teamviewer-14.1.18533
-1903141632 metadata/md5-cache/net-misc/aria2-1.34.0
 1903141632 metadata/md5-cache/net-misc/nxplayer-5.1.7.6
 1903212146 metadata/md5-cache/net-misc/exabgp-3.4.26-r1
 1809011539 metadata/md5-cache/net-misc/iperf-2.0.12
@@ -67572,6 +67465,7 @@
 1903141632 metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
 1903141632 metadata/md5-cache/net-misc/netifrc-0.3.1
 1903141632 metadata/md5-cache/net-misc/lldpd-1.0.1
+1904101309 metadata/md5-cache/net-misc/socat-1.7.3.3
 1803052038 metadata/md5-cache/net-misc/valve-1.0-r1
 1903141632 metadata/md5-cache/net-misc/gerbera-1.2.0-r1
 1903141632 metadata/md5-cache/net-misc/tn5250-0.17.4-r2
@@ -67589,7 +67483,7 @@
 1903141632 metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
 1903141632 metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
 1903212146 metadata/md5-cache/net-misc/networkmanager-1.14.6
-1904100739 metadata/md5-cache/net-misc/wget-1.20.3
+1904110109 metadata/md5-cache/net-misc/wget-1.20.3
 1903212146 metadata/md5-cache/net-misc/streamlink-1.0.0
 1903141632 metadata/md5-cache/net-misc/shmux-1.0.2
 1903150339 metadata/md5-cache/net-misc/dahdi-2.10.0.1
@@ -67795,7 +67689,7 @@
 1903141632 metadata/md5-cache/net-misc/felix-3.1.3
 1903291809 metadata/md5-cache/net-misc/connman-1.37
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
-1904100939 metadata/md5-cache/net-misc/Manifest.gz
+1904111439 metadata/md5-cache/net-misc/Manifest.gz
 1702282329 metadata/md5-cache/net-misc/sshrc-0.6.1
 1903141632 metadata/md5-cache/net-misc/nxplayer-5.1.24.1
 1903141632 metadata/md5-cache/net-misc/mosh-1.3.2
@@ -67831,7 +67725,6 @@
 1903291609 metadata/md5-cache/net-misc/openssh-7.5_p1-r4
 1903141632 metadata/md5-cache/net-misc/netifrc-0.4.0-r1
 1903212146 metadata/md5-cache/net-misc/nyx-2.0.4
-1902072239 metadata/md5-cache/net-misc/cni-plugins-0.7.4
 1903141632 metadata/md5-cache/net-misc/chrony-9999
 1903141632 metadata/md5-cache/net-misc/pps-tools-0.0.20120407
 1903141632 metadata/md5-cache/net-misc/radvd-2.18
@@ -67902,6 +67795,7 @@
 1903212146 metadata/md5-cache/net-misc/dropbox-cli-19
 1903141632 metadata/md5-cache/net-misc/dahdi-tools-2.10.2
 1808272209 metadata/md5-cache/net-misc/unison-2.48.4-r1
+1904111439 metadata/md5-cache/net-misc/istioctl-1.1.2
 1903212146 metadata/md5-cache/net-misc/python-x2go-0.6.0.1
 1903141632 metadata/md5-cache/net-misc/rwhoisd-1.5.9.5-r3
 1903291609 metadata/md5-cache/net-misc/dropbear-2018.76
@@ -67956,7 +67850,6 @@
 1903141632 metadata/md5-cache/net-misc/dahdi-tools-2.8.0
 1903212146 metadata/md5-cache/net-misc/electron-cash-3.1.3
 1903141632 metadata/md5-cache/net-misc/olsrd-0.9.6.1
-1903141632 metadata/md5-cache/net-misc/miniupnpd-2.1.20190210
 1903212146 metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
 1903141632 metadata/md5-cache/net-misc/radvd-2.17-r2
 1903141632 metadata/md5-cache/net-misc/stargazer-2.408-r1
@@ -68038,7 +67931,6 @@
 1902251540 metadata/md5-cache/net-misc/gofish-1.2
 1903212146 metadata/md5-cache/net-misc/gns3-gui-2.1.3-r1
 1904020009 metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
-1903141632 metadata/md5-cache/net-misc/rygel-0.34.0
 1903141632 metadata/md5-cache/net-misc/udpcast-20120424
 1903141632 metadata/md5-cache/net-misc/sitecopy-0.16.6-r1
 1903141632 metadata/md5-cache/net-misc/efax-0.9a-r4
@@ -68081,7 +67973,6 @@
 1904031709 metadata/md5-cache/net-misc/cni-plugins-0.7.5
 1903141632 metadata/md5-cache/net-misc/cmst-2018.01.06
 1803280139 metadata/md5-cache/net-misc/ipv6calc-0.99.2
-1903141632 metadata/md5-cache/net-misc/gnome-online-miners-3.24.0
 1903212146 metadata/md5-cache/net-misc/charm-1.9.2-r1
 1810090339 metadata/md5-cache/net-misc/s6-networking-2.3.0.3
 1903141632 metadata/md5-cache/net-misc/hashcash-1.22-r1
@@ -68562,7 +68453,7 @@
 1903141632 metadata/md5-cache/sys-apps/hwloc-1.11.11
 1903212146 metadata/md5-cache/sys-apps/selinux-python-2.7
 1903170509 metadata/md5-cache/sys-apps/hwids-20190316
-1812030339 metadata/md5-cache/sys-apps/collectl-4.3.1
+1904110209 metadata/md5-cache/sys-apps/collectl-4.3.1
 1903141632 metadata/md5-cache/sys-apps/pciutils-3.5.6
 1807041739 metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
 1903141632 metadata/md5-cache/sys-apps/ipmiutil-3.1.2
@@ -68581,7 +68472,7 @@
 1903141632 metadata/md5-cache/sys-apps/fakeroot-1.23
 1903141632 metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.0
 1903141632 metadata/md5-cache/sys-apps/nca-0.9.0-r1
-1903141632 metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
+1904110509 metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
 1903141632 metadata/md5-cache/sys-apps/nvme-cli-1.5
 1903141632 metadata/md5-cache/sys-apps/grep-3.0-r1
 1903141632 metadata/md5-cache/sys-apps/smartmontools-6.6
@@ -68686,7 +68577,7 @@
 1903212146 metadata/md5-cache/sys-apps/dbus-broker-18
 1903200009 metadata/md5-cache/sys-apps/iproute2-9999
 1903141632 metadata/md5-cache/sys-apps/toybox-9999
-1904100609 metadata/md5-cache/sys-apps/Manifest.gz
+1904110509 metadata/md5-cache/sys-apps/Manifest.gz
 1903141632 metadata/md5-cache/sys-apps/man-db-2.8.5
 1903141632 metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
 1903141632 metadata/md5-cache/sys-apps/guix-0.16.0
@@ -68857,7 +68748,7 @@
 1702282332 metadata/md5-cache/sys-apps/ifplugd-0.28-r10
 1712020139 metadata/md5-cache/sys-apps/collectl-4.1.0
 1903180039 metadata/md5-cache/sys-apps/yarn-1.13.0
-1903291609 metadata/md5-cache/sys-apps/util-linux-2.33.1
+1904102339 metadata/md5-cache/sys-apps/util-linux-2.33.1
 1903141632 metadata/md5-cache/sys-apps/gradm-3.1.201607172312
 1903311709 metadata/md5-cache/sys-apps/checkpolicy-9999
 1903141632 metadata/md5-cache/sys-apps/lcdtest-1.18
@@ -68961,6 +68852,7 @@
 1903141632 metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
 1903291609 metadata/md5-cache/sys-apps/openrc-0.38.3-r1
 1903212146 metadata/md5-cache/sys-apps/kmod-25
+1904102339 metadata/md5-cache/sys-apps/util-linux-2.33.2
 1904082239 metadata/md5-cache/sys-apps/rtl-entropy-0.1.2_p20180118-r1
 1903141632 metadata/md5-cache/sys-apps/debianutils-4.8.3
 1903190209 metadata/md5-cache/sys-apps/proot-5.1.0-r2
@@ -69068,6 +68960,7 @@
 1903141632 metadata/md5-cache/media-libs/libaom-9999
 1903141632 metadata/md5-cache/media-libs/libmms-0.6.4
 1904011909 metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.1
+1904110809 metadata/md5-cache/media-libs/mesa-19.0.2
 1903141632 metadata/md5-cache/media-libs/faac-1.29.9.2
 1903141632 metadata/md5-cache/media-libs/icclib-2.14
 1903141632 metadata/md5-cache/media-libs/SoXt-1.3.0
@@ -69082,7 +68975,6 @@
 1903141632 metadata/md5-cache/media-libs/wxsvg-1.5.11
 1903212146 metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1
 1903141632 metadata/md5-cache/media-libs/clutter-gtk-1.8.4
-1903141632 metadata/md5-cache/media-libs/jpeg-8d-r1
 1903141632 metadata/md5-cache/media-libs/woff2-1.0.2-r1
 1903141632 metadata/md5-cache/media-libs/libmng-2.0.3
 1903181039 metadata/md5-cache/media-libs/giflib-5.1.8-r1
@@ -69248,6 +69140,7 @@
 1903141632 metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r4
 1903141632 metadata/md5-cache/media-libs/libclalsadrv-2.0.0
 1903141632 metadata/md5-cache/media-libs/libvorbis-1.3.6
+1904111509 metadata/md5-cache/media-libs/openjpeg-2.3.1
 1903141632 metadata/md5-cache/media-libs/libpagemaker-9999
 1903141632 metadata/md5-cache/media-libs/glyr-1.0.10
 1903212146 metadata/md5-cache/media-libs/mesa-19.0.0
@@ -69325,7 +69218,7 @@
 1903141632 metadata/md5-cache/media-libs/memphis-0.2.3
 1904082209 metadata/md5-cache/media-libs/libmpdclient-2.16
 1807170139 metadata/md5-cache/media-libs/aldumb-0.9.3
-1904082139 metadata/md5-cache/media-libs/ctl-1.5.2-r1
+1904112239 metadata/md5-cache/media-libs/ctl-1.5.2-r1
 1903141632 metadata/md5-cache/media-libs/speex-1.2.0-r1
 1903141632 metadata/md5-cache/media-libs/libaom-1.0.0-r1
 1903211239 metadata/md5-cache/media-libs/glm-0.9.9.4
@@ -69441,7 +69334,7 @@
 1903141632 metadata/md5-cache/media-libs/libraw-0.19.1
 1904081939 metadata/md5-cache/media-libs/libclalsadrv-2.0.0-r1
 1903141632 metadata/md5-cache/media-libs/libv4l-1.10.1
-1904082139 metadata/md5-cache/media-libs/tiff-4.0.10
+1904110109 metadata/md5-cache/media-libs/tiff-4.0.10
 1903141632 metadata/md5-cache/media-libs/libmp3splt-0.9.1a
 1903141632 metadata/md5-cache/media-libs/rtaudio-5.0.0
 1903141632 metadata/md5-cache/media-libs/openexr-2.1.0
@@ -69458,7 +69351,7 @@
 1903141632 metadata/md5-cache/media-libs/libtimidity-0.2.0
 1903141632 metadata/md5-cache/media-libs/raptor-2.0.15-r1
 1903141632 metadata/md5-cache/media-libs/gavl-1.2.0
-1904100039 metadata/md5-cache/media-libs/Manifest.gz
+1904112239 metadata/md5-cache/media-libs/Manifest.gz
 1903141632 metadata/md5-cache/media-libs/libsixel-1.8.1
 1808151104 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1903212146 metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -69492,7 +69385,6 @@
 1903141632 metadata/md5-cache/media-libs/sdl-sound-1.0.3-r2
 1903141632 metadata/md5-cache/media-libs/libXcm-0.5.4
 1702282326 metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.1
-1903141632 metadata/md5-cache/media-libs/openjpeg-2.3.0
 1903141632 metadata/md5-cache/media-libs/libvpx-1.8.0-r1
 1903141632 metadata/md5-cache/media-libs/libilbc-2.0.2
 1902172039 metadata/md5-cache/media-libs/libzmf-0.0.2
@@ -69635,7 +69527,7 @@
 1903141632 metadata/md5-cache/media-libs/zimg-2.7.5
 1903141632 metadata/md5-cache/media-libs/libnut-661
 1903141632 metadata/md5-cache/media-libs/ffmpegsource-2.23
-1904080039 metadata/md5-cache/media-libs/ming-0.20181112
+1904112239 metadata/md5-cache/media-libs/ming-0.20181112
 1904081439 metadata/md5-cache/media-libs/phonon-gstreamer-9999
 1903141632 metadata/md5-cache/media-libs/lib3ds-1.3.0-r1
 1903212146 metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
@@ -69809,7 +69701,7 @@
 1807211909 metadata/md5-cache/games-misc/fortune-mod-tao-1
 1903261739 metadata/md5-cache/games-misc/opengfx-0.5.5
 1707090139 metadata/md5-cache/games-misc/sex-1.0-r2
-1903141632 metadata/md5-cache/games-misc/lolcat-90.8.8
+1904111839 metadata/md5-cache/games-misc/lolcat-90.8.8
 1903141632 metadata/md5-cache/games-misc/fortune-mod-1.99.1-r2
 1807210409 metadata/md5-cache/games-misc/fortune-mod-all-1
 1903141632 metadata/md5-cache/games-misc/gtklife-5.1-r1
@@ -69848,7 +69740,7 @@
 1807210409 metadata/md5-cache/games-misc/fortune-mod-debilneho-0.1
 1805261309 metadata/md5-cache/games-misc/funny-manpages-2.3
 1711251810 metadata/md5-cache/games-misc/fortune-mod-discworld-0.1
-1903261739 metadata/md5-cache/games-misc/Manifest.gz
+1904111839 metadata/md5-cache/games-misc/Manifest.gz
 1807210409 metadata/md5-cache/games-misc/fortune-mod-chucknorris-0.1
 1903212146 metadata/md5-cache/games-misc/doge-3.5.0
 1807210409 metadata/md5-cache/games-misc/fortune-mod-dune-2.0.1
@@ -72682,8 +72574,10 @@
 1902072239 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1709290138 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
 1903141632 metadata/md5-cache/app-emulation/ski-1.3.2-r3
+1904111309 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20190405
 1903141632 metadata/md5-cache/app-emulation/buildah-1.6
 1903141632 metadata/md5-cache/app-emulation/vagrant-2.2.2-r2
+1904102339 metadata/md5-cache/app-emulation/crossover-bin-18.1.0
 1903212146 metadata/md5-cache/app-emulation/crossover-bin-15.2.0
 1904050539 metadata/md5-cache/app-emulation/diskimage-builder-2.21.0
 1903162009 metadata/md5-cache/app-emulation/wine-staging-4.2
@@ -72733,10 +72627,10 @@
 1903141632 metadata/md5-cache/app-emulation/virt-viewer-6.0-r1
 1903141632 metadata/md5-cache/app-emulation/buildah-1.7.1
 1902072239 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
+1904111309 metadata/md5-cache/app-emulation/containerd-1.2.6
 1705261309 metadata/md5-cache/app-emulation/vmips-1.3.1
 1903291739 metadata/md5-cache/app-emulation/runc-1.0.0_rc7
 1903141632 metadata/md5-cache/app-emulation/lxc-templates-3.0.3
-1903141632 metadata/md5-cache/app-emulation/docker-9999
 1811051909 metadata/md5-cache/app-emulation/spice-protocol-0.12.14
 1901290139 metadata/md5-cache/app-emulation/virtualbox-additions-6.0.4
 1902072239 metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20180122
@@ -72771,7 +72665,9 @@
 1903210139 metadata/md5-cache/app-emulation/wine-staging-4.4
 1903141632 metadata/md5-cache/app-emulation/vkd3d-1.0
 1903141632 metadata/md5-cache/app-emulation/docker-proxy-9999
+1904102339 metadata/md5-cache/app-emulation/crossover-bin-18.0.0
 1710122038 metadata/md5-cache/app-emulation/docker-bench-security-1.3.3
+1904111309 metadata/md5-cache/app-emulation/docker-18.09.5
 1904041809 metadata/md5-cache/app-emulation/libvirt-4.9.0
 1903212146 metadata/md5-cache/app-emulation/crossover-bin-15.3.0
 1904012309 metadata/md5-cache/app-emulation/q4wine-1.3.11
@@ -72791,7 +72687,7 @@
 1903141632 metadata/md5-cache/app-emulation/softgun-0.22
 1902211339 metadata/md5-cache/app-emulation/phpvirtualbox-5.2.1
 1902072239 metadata/md5-cache/app-emulation/img-0.5.6
-1904090309 metadata/md5-cache/app-emulation/Manifest.gz
+1904111309 metadata/md5-cache/app-emulation/Manifest.gz
 1903212146 metadata/md5-cache/app-emulation/playonlinux-4.3.4
 1809180947 metadata/md5-cache/app-emulation/docker-gc-9999
 1902112109 metadata/md5-cache/app-emulation/virtio-win-0.1.160
@@ -72808,6 +72704,7 @@
 1903212146 metadata/md5-cache/app-emulation/spice-9999
 1903141632 metadata/md5-cache/app-emulation/wine-d3d9-4.1
 1902072239 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180907
+1904102339 metadata/md5-cache/app-emulation/crossover-bin-18.5.0
 1903212146 metadata/md5-cache/app-emulation/crossover-bin-17.5.0
 1903141632 metadata/md5-cache/app-emulation/containerd-9999
 1904030809 metadata/md5-cache/app-emulation/xen-4.12.0
@@ -73030,7 +72927,6 @@
 1805212239 metadata/md5-cache/app-cdr/cdlabelgen-4.3.0
 1903141632 metadata/md5-cache/app-cdr/dumpet-2.1_p20140601
 1903141632 metadata/md5-cache/app-cdr/daa2iso-0.1.7e
-1903141632 metadata/md5-cache/app-cdr/cdemu-daemon-3.2.1
 1702282308 metadata/md5-cache/app-cdr/iat-0.1.7-r1
 1903141632 metadata/md5-cache/app-cdr/tkdvd-4.0.9-r1
 1903141632 metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
@@ -73045,7 +72941,7 @@
 1709041839 metadata/md5-cache/app-cdr/mirage2iso-0.4.2
 1702282308 metadata/md5-cache/app-cdr/cdck-0.7.0-r2
 1712122339 metadata/md5-cache/app-cdr/disc-cover-1.5.6-r1
-1904100009 metadata/md5-cache/app-cdr/Manifest.gz
+1904101839 metadata/md5-cache/app-cdr/Manifest.gz
 1903141632 metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
 1903141632 metadata/md5-cache/app-cdr/cuetools-1.4.1
 1903141632 metadata/md5-cache/app-cdr/cuegen-1.2.0
@@ -73069,9 +72965,7 @@
 1903141632 metadata/md5-cache/app-cdr/isomaster-1.3.14
 1903212146 metadata/md5-cache/app-cdr/burn-cd-1.8.1
 1702282308 metadata/md5-cache/app-cdr/bashburn-3.1.0
-1903212146 metadata/md5-cache/app-cdr/gcdemu-3.2.0
 1904100009 metadata/md5-cache/app-cdr/cdemu-3.2.1
-1903212146 metadata/md5-cache/app-cdr/cdemu-3.2.0
 1903212146 metadata/md5-cache/app-cdr/burn-cd-1.8.0-r1
 1803300009 metadata/md5-cache/app-cdr/cue2toc-0.4
 1904020009 metadata/md5-cache/app-cdr/isoimagewriter-0.2
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5ebbf1e33e76..674c78a2fc6f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Apr 2019 08:30:01 +0000
+Thu, 11 Apr 2019 21:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index fa3a1d0decdb..d16eeef50d91 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3a3fdf08f2803198f74b458518822f4b75330b44 1554882395 2019-04-10T07:46:35+00:00
+70e9b5c3ac83e8d6a0c61c6415c4a20358f9d596 1555016504 2019-04-11T21:01:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 34a3a5838443..e9e3404fc340 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1554883501 Wed 10 Apr 2019 08:05:01 AM UTC
+1555016701 Thu 11 Apr 2019 09:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a3d3f67e9836..28294eafa631 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Apr 2019 08:08:41 +0000
+Thu, 11 Apr 2019 21:08:42 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5cc1272adf30..8e33c2c63b0c 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 13282871fd31..ed193225b474 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -2,6 +2,6 @@ AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf84919
 DIST tcpreplay-4.3.1.tar.xz 746804 BLAKE2B c1feb541b8243b00b2fa6ee9742ced4ef47c58a58d3a95be88faa0fa4301da0cb962a620df724cd4526ea31e74a0e7d7161eb44afea37467a19976a20855e0e0 SHA512 2dbad1a88ed19db897cc1222883c02eb7f0808f64cafb3c3ef8f21c0cfcb14d3ebb92a8a01ea203ca128ed675d2e7dcdb30d0bce30eb79e729d9d45d309f9220
 DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9
 EBUILD tcpreplay-4.3.1.ebuild 1921 BLAKE2B 901852df7b7c0ef75796e2313c1940a595f3c40fc9a62cf27caeffe45708e1e11a9d16c5e9bd01e3880b1b9391b728164347e21caf2168ad1c4414d825cfa42b SHA512 3ad59027e0d85ee1230cc79e3b05024b979e9fc49bae10aad3a83e21cb5684847105264df4c354959561b593a39937f851f8dc87176b53fcef3694c4d3997da4
-EBUILD tcpreplay-4.3.2.ebuild 1922 BLAKE2B b173e698300d4421a1e46adf710ce3e5aa709602658d6115db769a4de00b20d1fc018137feaad9777a4da590a70eea73dfa1559f103e4317a58ad4d2c2d7fec7 SHA512 9704dc68440b5f9fea6b7d50cee0d3df43926fd0aba7e500f8f32cd81a063c3c845e02450615ed88a6be4ef36a9fa2bfb5682ce7db1e86ca349530efbcb36f85
+EBUILD tcpreplay-4.3.2.ebuild 1921 BLAKE2B 901852df7b7c0ef75796e2313c1940a595f3c40fc9a62cf27caeffe45708e1e11a9d16c5e9bd01e3880b1b9391b728164347e21caf2168ad1c4414d825cfa42b SHA512 3ad59027e0d85ee1230cc79e3b05024b979e9fc49bae10aad3a83e21cb5684847105264df4c354959561b593a39937f851f8dc87176b53fcef3694c4d3997da4
 EBUILD tcpreplay-999999.ebuild 1860 BLAKE2B 7e5894985eb08e8b82aa434bb30c096679c50995203be58c2490374e9163502b50585fe2afc530e9de918441181d1deef76ea999030bc40d4a077ca6b6da83e1 SHA512 36de21822cd88ab40c1c7b70c762be1284391bbb42ad0b56b9d10ddfe3de4b5f9e9195c41d900dc57fe84064003cadb389b3fefc13283e871e2adc14dfb02ebd
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
index a9f8339e6ef5..3d0c5b4f1d7a 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild
@@ -10,7 +10,7 @@ LICENSE="BSD GPL-3"
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="debug pcapnav +tcpdump"
 
 DEPEND="
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 7b2ff0cfeb1d..76b4617aedd5 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -13,6 +13,6 @@ DIST wireshark-3.0.0.tar.xz 30953760 BLAKE2B ee866966000cf902da6f330eb8a4b281d34
 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
 EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5
 EBUILD wireshark-3.0.0-r1.ebuild 6677 BLAKE2B 644e25d08956e608e40313d7e974926c617c3cfa9ff05e45cf14be2a1d453bdb186dcfad2a2ceedd53cd30f8d854292a6d9e1171826a59d26f5b5b1bee772038 SHA512 56b471c1a6ec596ea678e0f03bd3a304cddbbade2f02fb9d1c11a3aaef8665a9ab60fabf585875c02cee5b2eb1b49c33a828060033daf3a18fbbb15d3fd4c702
-EBUILD wireshark-3.0.1.ebuild 6650 BLAKE2B 944a5c9765dd8754a04e24062ce9c1b5b2fbc5df896712d4a9ddf1a6ceacbc1079668961a3ceee8bd645f6ab571fa041ab00d2c110d7f7c21d770141f00c9f95 SHA512 f7a38f46e69ba8291e90ec29cece565dd5541111c9eff708be62c7e5d02804896b979037cf9bdc6947c0e1434cb4ae3f19441de24c3d31b56a0abaad76b5c198
+EBUILD wireshark-3.0.1.ebuild 6649 BLAKE2B 5881e6db234a67a708c036c7db226c365f342cb9d7ae47077bae571a9c787248c4c1e11b420e2b3a69f4df226feb552468439ca886f95661559fc3407d19c8d5 SHA512 287ed45fef44cd9dff50ed0019b58309adc581baeeba10ee47692d162ceb0eceab1368106ab197d4593b501a2d056740a3ec80199dba82569e2b3af14ff884f8
 EBUILD wireshark-99999999.ebuild 6607 BLAKE2B c837949c6769fe700e81d303402c9bf40bd045c3da6b8baee423ddb5594664f4f99030edcdf955433fe2f593628a8f72a1645c00adf933f27e7e54222889b02e SHA512 6d6154f198b827b6ba8e872032b07a88282fde989752e58638c9d6b00c9708d3a94614304c7e835cf3c48f608992405ffa756e25bac61749c8e4ce336528f7ed
 MISC metadata.xml 4882 BLAKE2B 82d8cc65f2229522e9ff07e650d6fbca97143b7cf65c1e5a576362af265e945f24507a2b1deb6d2d32ea72197b2fdab9d946ff96210ec8d5bb4d32fabea4eadf SHA512 9a391d56aaa05817484ec1a9c82acfe074657ecf9356d94b8837d908a014fd5732281ea6d28d4759f711e0772dfaba19f64043921aa65657b389c909cc68c707
diff --git a/net-analyzer/wireshark/wireshark-3.0.1.ebuild b/net-analyzer/wireshark/wireshark-3.0.1.ebuild
index d451248ae6d1..7ed150c5cdd3 100644
--- a/net-analyzer/wireshark/wireshark-3.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}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="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 81e1ea3eeddb..6a65d9bcf1df 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 8536291fe282..0ff0c137d3e3 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -3,5 +3,5 @@ DIST libidn2-2.0.5.tar.gz 2091929 BLAKE2B 1eb52ae7c9295bf4b5d6e36e6852ffb54b1066
 DIST libidn2-2.1.1a.tar.gz 2122867 BLAKE2B 616bdf4c2c5095a29511db293fa908d4cac23f77e17bb6c60f8aa8c8a8a10f1b4e8b84b82406599fe0cc7122fd89c50ec252f1716198f72496800a19924fa09c SHA512 404a739e33d324f700ac8e8119de3feef0de778bbb11be09049cb64eab447cd101883f6d489cca1e88c230f58bcaf9758fe102e571b6501450aa750ec2a4a9c6
 EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 1c59cb393e3eb99006bfe99f21fb48de733a5cb55bb9729531e4b0f40c30ab90f187f100609aaa5ad6c98499fadf66ad457ddd96a5897703cefe00fc0e03b768 SHA512 7a77cbb77800e71ef7c77befbfb2ce16a7a74cd75f35f674686fa8435acad15b216794e6b3473d7adac6cb6e9554c6b59c37830162c66711d3af4765847ba06a
 EBUILD libidn2-2.0.5.ebuild 1239 BLAKE2B 2e1caba85c2a501947afd2a8d6291a64feb35487b6ceeeed7d0479944d3257fdbb8f189999c66bb2a774f377bbe6351b8fcabedd13ed7c72497a61caab7146ea SHA512 df5f8e536da174a039f1538c53da6827515eacd0198e8aa00c3fb71c9cca9ed52a024c68d0834e4acecca981f87462472a30c7d00a46d2a9cf5ea9da8f03e067
-EBUILD libidn2-2.1.1a.ebuild 1258 BLAKE2B 62a960eddc5101269ceaf010ab3666af7cad1983d4d8f1a1ccbd55bad310f1c6adfded58a4e08316c93f854d362021da7060ce4e0e8a1191311b3cd7ccb6f441 SHA512 7c7b1b695071a2b86ad92472215d17671fe52809d02002baf000195c9278bb3b563dd7257c5d5ed4da5b612440be10241c335c606494203b8384873b39cf9d2f
+EBUILD libidn2-2.1.1a.ebuild 1257 BLAKE2B 8e7f3df902d1dd00db62dc6492885ea203d8aa7df50345a11f31d8f7808ac3c3873d54c2de2ee37aef545f529a3bb24a11e72a5f1358c510104863d0bd30796e SHA512 7dd343eefd2286c402c04d7aa6d0c6da4f76712f6f24ab6c4172aeadcdcc1bc484cc895412f72eb7ec3e2e2031bb9e2324e559b78f1b94546745db1424c70ac3
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.1.1a.ebuild b/net-dns/libidn2/libidn2-2.1.1a.ebuild
index bdca77c48eab..fd3e3ad6d3bd 100644
--- a/net-dns/libidn2/libidn2-2.1.1a.ebuild
+++ b/net-dns/libidn2/libidn2-2.1.1a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ LGPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index d1b9f2edee78..9f802df171b6 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,6 @@
 AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f7750262329cc5d47fefdf8bcb5208807e47638037a704abbbebd0ee2b1380a3d1d54feab6d4900c250176 SHA512 9dce3cd454ed6b61af8d70c90a8464c60d16eb8342ffc46558f5dcc5089c77aff4581f208684ddb25c4512ce6f39c54afaf267dcade667d812511ae3fa3a1f48
-DIST pdns-recursor-4.1.10.tar.bz2 1238148 BLAKE2B b68e33b40d5f1a680cbbd76c9864439a84416071dc75d658a3988e891da7f6a5d0c197d8dda7ff014a30b7f762bfbe5db4a616a6cad4415fd46db119b51ba70a SHA512 204ea40f5c14d1e589935af4fbd24c102090390d741dbc5ad28f4c20044011f4b2b1c7926d8caaf144a7b2b1680f793e66199c5e9238e926da9fba60c5573dcd
 DIST pdns-recursor-4.1.11.tar.bz2 1239986 BLAKE2B 33c9b2a2f811c43b67ad2bddf5a11d5d95cc88679d46ba3513f3eeec97bf7694af493a9fea4f733f003056b5f0fc971112e9062883324102ecca28838e2f3e41 SHA512 6041d31f0a517786f44a7fa22c7bfa94d5d4bdc3a7f349d2b47bc66be87404fe8eaf76f45ca18ef8ab96a45c0271f46fdba93a51fbda2542a3ad96e10f51c1d1
 DIST pdns-recursor-4.1.12.tar.bz2 1245110 BLAKE2B 187fe117ab64f234d144d7e2d91a119afe1d6b0a45079f1f9527724081c64f594c8c5d5b4dbc6e25b4beef1fcdfb3e5caed8e5a434921bf6b66e07617d0fb6f9 SHA512 d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e
-EBUILD pdns-recursor-4.1.10.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
 EBUILD pdns-recursor-4.1.11.ebuild 1756 BLAKE2B e2fbacc7c51b9979ec9b1a034cac79d3f0960b70614aacb69362577e047383d03b35e2baefd0e5ceea666baa913e4bf2c068b2ab9d28567f8bd0458b2c63506e SHA512 acd802ca6e50382bbe08992ee77791d08ad9aeae143d889423bfe5cd08818fe83e0ec091ab1e65020883d838779bc344b0969a6f90dbb241fb66666fb0b434d8
 EBUILD pdns-recursor-4.1.12.ebuild 1758 BLAKE2B bbee1332e0392092ccce34b4d75e10988559d5ed91a2aafa27c3408c6beb36468a303178f39b76edc42cb498318a7465578ee3dc3b2eba82f8c5a46e69532f88 SHA512 fb9ca18f4b87b744a5421648ea14039fe6f00a95434d3ab992723d8cd184ff2e04808a0a509d5be6515f32c98609024babd00b3d8a89e4e8319218686e13c064
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
deleted file mode 100644
index 45a74d2b9434..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.10.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="libressl luajit protobuf snmp sodium systemd"
-
-DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_enable sodium libsodium) \
-		$(use_with !luajit lua) \
-		$(use_with luajit luajit) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 3851515f8dd3..fc3f1b6a0d79 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/docker-volume-netshare/Manifest b/net-fs/docker-volume-netshare/Manifest
index 50db44b97766..35b8ca5a2d90 100644
--- a/net-fs/docker-volume-netshare/Manifest
+++ b/net-fs/docker-volume-netshare/Manifest
@@ -26,4 +26,4 @@ DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 3904
 DIST github.com-spf13-pflag-ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz 41039 BLAKE2B 1dae2f35f0f165c94b3477cf853126cd7c3a9171bbfa639b505936c6ec495a27f99d2c69b34cdf09641959ada6559b5d707cca808069eb4dae20ac4a5443fc89 SHA512 4b5ed5c08f08f347be1832ea5bb8b8ea4ca7b5c5fc8aff2a08dfe667e0c8c0bc1a55ade7ebe83d68746a10af317eec3e8053d2d63a3e24caf437eff7405e719c
 EBUILD docker-volume-netshare-0.34.ebuild 1765 BLAKE2B 90b29e560a4c953a5e5ff48de716f258a10e7f578d6f67c675647e474de5b31aac61b4088a7a91a0d505b910b494c508aa0e9fd6c024adccdf7053707a87daa0 SHA512 407de406ca4c37cdabff43407954d99c91ab3089f2a4edfbd8316b72ce458a08aeeb0c980c9fefe15538f3c1372af673ac276637f1b1282544bebf1a38d834e0
 EBUILD docker-volume-netshare-0.35.ebuild 1782 BLAKE2B 941b9c6b48fd0205305798e46e8ca8acb4f61e753d9f825c810c925b23ab4ded8e0f7c6ee92a63a49fd08697d56d47b41a179f0c1c6bf9b973bbed57658efcc1 SHA512 21506318a5c750081ec20febc2f5a01fbd7d8fff137081a9a822848f3e9a6f5f270d9d07b6265c6454dccd046dc7aac5f52a3a6cbc3f8dac4771350dc52469d2
-MISC metadata.xml 351 BLAKE2B b724534ccc5b311f9610fe06a56ecc6382cc59962d661a08bc59bd97457e1fb4530ae00a6d976a0168ca1e9501e0cac976eef5f455e6cf50e24b57631f3e17a5 SHA512 8d10ac1384531b448d25f8d9533b84abe6a21f561e027600a1f0a23152468dac80db4e425d471b35473435e2aaa9dfb8a271a259f12c6b890b95639c44b201b6
+MISC metadata.xml 268 BLAKE2B 5d31dcd3b8c1daf54b4d26f99b5a6f105cf1985fc0209135976a5f0a6d1abe23ff3d4b760292a4cdf5445a99a288f7990e02fe7aa3927103da52791d13358433 SHA512 ae6cf611c58c1b63c2479f82810c5daef47708cee934892c06deaf2b435f4db3ba3b829620fca35369f1e9cbdb97293fc48500b00308445dd1813ab811ea3503
diff --git a/net-fs/docker-volume-netshare/metadata.xml b/net-fs/docker-volume-netshare/metadata.xml
index 26c8455b4c5e..75ff92f73e6a 100644
--- a/net-fs/docker-volume-netshare/metadata.xml
+++ b/net-fs/docker-volume-netshare/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <name>Manuel Rüger</name>
-    <email>mrueg@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">ContainX/docker-volume-netshare</remote-id>
   </upstream>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 94105ca22712..3b8fa2137d10 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index b58977299edd..5311a7d085e8 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,3 @@
 DIST skypeforlinux_8.34.0.78-1.x86_64.rpm 96457671 BLAKE2B 260de8eabddbad74ea5b0bdf903eb6607eab320713e746da315b7de2a897c1e8df9fbe8e279666101fb1894c547c23dcff4e7259a35e4f61ae0a70174288d54f SHA512 b83bf553c92c21d2ee418409c7cc0b560f675f5d958c80d96b71e3be4ddefe2e75ea9b9f2b37f5e4d5f25c358e451940fb44182da173d039331f3a88083038e6
-EBUILD skypeforlinux-8.34.0.78.ebuild 3685 BLAKE2B 5f3aa791f48fe0056e38d189053572b0d57b19d1246ab63f7a75574435528dc7e40c12ed833084bf2e1c29d7e2f6e55de77b2e1a4a712ae9db4eb2bbfc830c66 SHA512 463c53ca2023bddd96e91d7a382fe544c4583936241e8cb96eab77f69c0845e5ca2cb10f5421f294ca5fdb2b96e041419a98c57de200aadb21e842baa77b9f7b
+EBUILD skypeforlinux-8.34.0.78-r1.ebuild 3735 BLAKE2B 9fa6708cb38252529b66dd11d0706683a890a5b165adaf160c7a3b3d7e467985302b87708af93a06c805bca90ae25c2f1a964d543cb3b86712954fe2b33755d4 SHA512 4bb77e2358401e3c80ea0470a1704e1a04f5b4c2dbdd658cbd0132753222aca01dab3940dafca0671e06a77b742a1bde26ed91bcf89871fb798a4dc9359539fa
 MISC metadata.xml 678 BLAKE2B 08cae428a7267eb18dd5bbb460dcb617a8eaaf33ccce7229f90e3031f526125922b84d445577e91620e01ccaf789109c331bb11a03362cec9c15ad85162f4b43 SHA512 5372348bd01b1e828c29866180e85e9230ade0aa36f23bfcc89fb10dbf7f1b92530ac00c9dd0fe9977061a660abf9780ab2e59069db2115fb2dacbc5e3ffd26a
diff --git a/net-im/skypeforlinux/skypeforlinux-8.34.0.78.ebuild b/net-im/skypeforlinux/skypeforlinux-8.34.0.78-r1.ebuild
similarity index 95%
rename from net-im/skypeforlinux/skypeforlinux-8.34.0.78.ebuild
rename to net-im/skypeforlinux/skypeforlinux-8.34.0.78-r1.ebuild
index 63b1b43fe4a8..32896b26fbc4 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.34.0.78.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.34.0.78-r1.ebuild
@@ -22,15 +22,15 @@ RESTRICT="mirror bindist strip" #299368
 
 RDEPEND="
 	|| (
-		sys-auth/elogind
-		sys-apps/systemd
+		sys-auth/elogind[${MULTILIB_USEDEP}]
+		sys-apps/systemd[${MULTILIB_USEDEP}]
 	)
 	dev-libs/atk[${MULTILIB_USEDEP}]
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	dev-libs/nspr[${MULTILIB_USEDEP}]
 	dev-libs/nss[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[policykit,${MULTILIB_USEDEP}]
 	media-libs/alsa-lib[${MULTILIB_USEDEP}]
 	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
 	media-libs/freetype:2[${MULTILIB_USEDEP}]
@@ -41,7 +41,7 @@ RDEPEND="
 	virtual/ttf-fonts
 	x11-libs/cairo[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
 	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 21486f389f70..fbf1fca9e6f3 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 71f2c640e3b6..a3151754beda 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -9,5 +9,5 @@ EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c
 EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
 EBUILD gnutls-3.6.5.ebuild 4178 BLAKE2B 5c96edf0869162b0c675b567827269e424fd7e6c32f2a15ec59cbcb2632eb830dfefc1445f0a64d5ae5e2ee6ffb79d43a5bb57b8ecc3de295bc732f6da6aaf09 SHA512 19f72f1e92ff14263397ef949065f4d536457e1b8a760cf7b736368d22cc1791ed9ffa4e8b4525efe0f84887905cc405b7d9e023c2b13324c7b680594e944fb1
 EBUILD gnutls-3.6.6.ebuild 4108 BLAKE2B b4501e92642faa08de2b35bc109601d3f6d170f80e0e54713cf0c4824d150f396e5881c12b40b12add1235d88c36f61ad421391478631eb89823a5bdde0c7370 SHA512 c54db18e14381188a2c83a1702108837bca6000a6cb1236dde5973f8be34bc5c3056233d0e6075e389fd9a694fe00a252bd7193dfebd6839ef316a7fb03c386d
-EBUILD gnutls-3.6.7.ebuild 3903 BLAKE2B 2af7d8eaf3c12576bc71f12c75d0cb8fb2afe6910b20c82e19b840b5ad655c544cd067b31ff5204e0a52993d651457fc7c85fbbf4380e0b8bf6d3897764c6e75 SHA512 03e14cede80ec5126c2076f645e1ed569844f2eca96ab5fa39b01d590434c97ecbadcdc795fc4446608400dbb0005b498645773892cf4daac7805d8d2ff3aa5e
+EBUILD gnutls-3.6.7.ebuild 3902 BLAKE2B 5b9e8d4cf40da19b8e0fd06bc9d4c0a901275bc37d889e2ef71a4553fa0de9a60151346c37be3a5947ef77d3288046037fda516c07b176743a531bf103fd49b6 SHA512 e46629073b999ea322a65dd9d42f19eceead5649553e5992902f7b9e5de863eb0b8c74d71ab8d0bfbe23b10f033959d437ea55023f34f0bfb133deed985a0f5e
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.6.7.ebuild b/net-libs/gnutls/gnutls-3.6.7.ebuild
index 4fbd5bca874c..71c9418b7401 100644
--- a/net-libs/gnutls/gnutls-3.6.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
index d1878a99f781..1081991d69c5 100644
--- a/net-libs/gupnp-av/Manifest
+++ b/net-libs/gupnp-av/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-av-0.12.10.tar.xz 370552 BLAKE2B 0ccbbbbf88ba48e926634efcf550924b77a8fec1a1e660dc4f6aabdeba12db87c7e2dd4ca6875e34ae313e90cb9ee715c7176f29d6456a68799b68fdcab763a0 SHA512 dbecef1f725dd05e1d4f7f9dede02f26a022d8d3c98ed2344d28746b74fb81703026df8cdd7ed0f3060b55a5da6d88def1e92a80e1f1892ad7c0806124ef5269
 DIST gupnp-av-0.12.11.tar.xz 373052 BLAKE2B 3c324f790f0ffbcbd6cbf3b95dfdaf9dce51c6bf7bea3051fd5ded31b930dd6ff7b77b16a297cf54a49e738c195fd208dd4e83961f5ee3d302dc84f37b36924c SHA512 f6fb8897ccdb589446d8c83c5fe66918f0f569a624287881aaf41d928e429e41f3306443e24ef4d43d3ddffb24da2ad2c058cd39211176558c9cd7acd7af0ff7
-EBUILD gupnp-av-0.12.10.ebuild 884 BLAKE2B 947b39a8e30f1f4adecf6d37f68d12d6db9b862470370fe0dae8f845e24e1966a60eef1c2309fe70d8417c250cf7543da6e9d2434c7375305eb5577614ad48d3 SHA512 3af4660bcf16c591283bbdacd5e99ef67b1c58b52a9eaafad415c779eea1d31ffc7115712e8913ab48071c3ef6b37679a5e01151692521e749b221eb2af8fe48
 EBUILD gupnp-av-0.12.11.ebuild 881 BLAKE2B 626f2d855f4b980946a971217c1b5af6896abf4dc4144eaa82f25c411892c49169a762b91589c3a37ebe8944b6d8e0040aea6367ed15d3d55d1505e46ff9b126 SHA512 ce696ef103ec85ffe33384ce66d191c4d3d543463b232739db6079302b95988bb7ff2298a063248291ec284210049f57fa7a89c29f060f94a07d1b3478c1d654
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.10.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.10.ebuild
deleted file mode 100644
index 0f2fc3c91fad..000000000000
--- a/net-libs/gupnp-av/gupnp-av-0.12.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=net-libs/libsoup-2.28.2:2.4[introspection?]
-	dev-libs/libxml2
-	introspection? ( >=dev-libs/gobject-introspection-1.36:= )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index a03c595980d7..59ee8c091fa8 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,6 +1,8 @@
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 DIST http-parser-2.9.0.tar.gz 51324 BLAKE2B 5607f3b3da087ba7d7352e896e209a4fd118428f526cf5465fe86253cc01779c79c867f5db6467df8e3b7bad2ca8675050ef9ed1877a945ced8d3fdd47bfabde SHA512 40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e
+DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
 EBUILD http-parser-2.8.1.ebuild 1010 BLAKE2B 41fd9e9bc96b39e583f49ec1c01befc7a0b68af0ae21dfff5523c5a8e54bd141fb7b470e47c7ef7c5ab9eda7a19ec64ce290371307c974e753c5477daa70330f SHA512 e1690bdcb1a2b1bc9f1e255e8d494d0e53f46937f89abf24a8106e1194961213f2f2d72370e81be29e3d1a8568df143c9a7fd80967a5d4df3975ba724e89bd56
 EBUILD http-parser-2.9.0-r1.ebuild 988 BLAKE2B d9bc9eb32473fdb043c382ba95dc52a91ee6b9e2d50cd9051922647fc38d877418df96bfaa8c5ee1dfc47c235b752ff8ad2a343f424b5e7221aa1924f652024c SHA512 75d669298b05089742760207ce4ef40ebf8a0b55ae2fefedfc5e50257ad88b80db2eecb99f3e84be57113503e27f53a0a4933c881989b760ba5d44b5de19a58a
+EBUILD http-parser-2.9.1.ebuild 988 BLAKE2B 22e14115cbd3f6bf6ba95751ac1f5bc891823b18b9c19c024458a964f2beade70b5c2a8591461f82de19fc336f604b94f8f1fe819ce8af8454d5f960a1dba624 SHA512 c37817c6f5c2eadfa559616c9c2ff4115ff84cf0bb5fd575c119b57833516885de0cb8d6ed20b522aaccd2ab122e0314231ed0591632ecf1212c3fb52eb8fe4c
 EBUILD http-parser-99999.ebuild 848 BLAKE2B a34ef61acb4072b1b51e13f4381fc6076b8b5e2693a281d1d41a0a15455ec29532aa7c69e474ecaad23b2230ff0d9894d02302e6940148ae19dafc080b508761 SHA512 b74380f265418b2956102b0d56c34ebbe8a439eb81dfd75f91b80eb266094d19940f29af59d50c894f832499af6aca11710ba14631b6111f5a9ea2c4ff4d1735
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.1.ebuild b/net-libs/http-parser/http-parser-2.9.1.ebuild
new file mode 100644
index 000000000000..2abe7cff69f8
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.9.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="HTTP request/response parser for C"
+HOMEPAGE="https://github.com/nodejs/http-parser"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.9.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	tc-export CC AR
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest
index cf9c19dc2e73..a782f7e763ba 100644
--- a/net-libs/libiio/Manifest
+++ b/net-libs/libiio/Manifest
@@ -1,4 +1,4 @@
 DIST libiio-0.15.tar.gz 192704 BLAKE2B 7eeaad1535f69ca11fe3f716ac70a161f98d24513fe910cb34ca11a0b63c07f5b5321447c96c247cc9a76ed838d806fa9f160e87fd10f1aeac5025edfa16b8f6 SHA512 7e3ca1a8b97486f20baf38afecfd26c626bed1fef535d88020d11eb4e49fc1226390c6383799222f6811c13b8b7e5cc77fb899c776c150a9d1c2024bf8ab338b
-EBUILD libiio-0.15-r1.ebuild 662 BLAKE2B e59b4222302bc9a4f52e561f3c710460198ade34f65588d33fcbd55afe9536f965d96283ae244968f3d855dd6cc8bbf24107d1b1fcbd8147018919285dc0ab0e SHA512 3f669cadb91c1697387d8484206ee6733c49fc16d937c73ca0830e0bcbb629af5f1d7c4c9635e2232876df638b09f5666898fa3a5ac7e35e5eaaa63c61935158
-EBUILD libiio-9999.ebuild 662 BLAKE2B e59b4222302bc9a4f52e561f3c710460198ade34f65588d33fcbd55afe9536f965d96283ae244968f3d855dd6cc8bbf24107d1b1fcbd8147018919285dc0ab0e SHA512 3f669cadb91c1697387d8484206ee6733c49fc16d937c73ca0830e0bcbb629af5f1d7c4c9635e2232876df638b09f5666898fa3a5ac7e35e5eaaa63c61935158
+EBUILD libiio-0.15-r1.ebuild 665 BLAKE2B 06d334a64348f8d53a202856872cd96b457384c55f5ba823ddae3d199cdbbf91f649a3485ba718855b089df3ed27ce3b738664e8c42027225a6db5c301d12079 SHA512 94c5233cbf63ee675fe904e00cd1d9570678551d08c3863008ae93134ec180a08f235c62243f9694d792efec29719d297269ba6c4bb16366cf478c6b4b41bbde
+EBUILD libiio-9999.ebuild 665 BLAKE2B 06d334a64348f8d53a202856872cd96b457384c55f5ba823ddae3d199cdbbf91f649a3485ba718855b089df3ed27ce3b738664e8c42027225a6db5c301d12079 SHA512 94c5233cbf63ee675fe904e00cd1d9570678551d08c3863008ae93134ec180a08f235c62243f9694d792efec29719d297269ba6c4bb16366cf478c6b4b41bbde
 MISC metadata.xml 506 BLAKE2B a3be5b15b8043c7e52b3a3ed6a01dab5731286ba3266285426ef8c56bd1124fbf8a2b3083cad85094ff5d0ac0f06a6127ccbfcdc89502d909797deacb14aabb9 SHA512 c408630124499db22c21e2f2911fb7dd023f1e704b895c770c2510a08f7b3516cc83aa8d50a6e6aa2c0365ca7e91064a1cb664ce80e1ba153d68a381182264ba
diff --git a/net-libs/libiio/libiio-0.15-r1.ebuild b/net-libs/libiio/libiio-0.15-r1.ebuild
index 64bf1679f217..3a277614bfbe 100644
--- a/net-libs/libiio/libiio-0.15-r1.ebuild
+++ b/net-libs/libiio/libiio-0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,10 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-IUSE="+aio +avahi"
+IUSE="+aio +zeroconf"
 
 RDEPEND="dev-libs/libxml2:=
 	virtual/libusb:1=
 	aio? ( dev-libs/libaio )
-	avahi? ( net-dns/avahi )"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild
index 64bf1679f217..3a277614bfbe 100644
--- a/net-libs/libiio/libiio-9999.ebuild
+++ b/net-libs/libiio/libiio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,10 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-IUSE="+aio +avahi"
+IUSE="+aio +zeroconf"
 
 RDEPEND="dev-libs/libxml2:=
 	virtual/libusb:1=
 	aio? ( dev-libs/libaio )
-	avahi? ( net-dns/avahi )"
+	zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 2ceef6670ca8..9ed9de5a1ebf 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,9 +1,5 @@
-DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
-DIST miniupnpc-2.1.20190403.tar.gz 94204 BLAKE2B 6dd23a2b0b497a95bf8a92d63b95b8d3c85074845d1f2d9380701107e12262cacc2e80d4c324b95aeca76412ec85d5e6118eecc2131f352c8f2a5d489f833d40 SHA512 810ece8f3679c8caab447a621a7bc128a2f1780b455574d3514933c0601223cb14033e97f8e667c596632a75f651dbbb0294523d873e8212fdb5fd3cef61e65f
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
-EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
 EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190403.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
 EBUILD miniupnpc-2.1.20190408.ebuild 1342 BLAKE2B 671942063a16c89ec176127db3463e507df02b0096c74fc52ba3423ff0d5cd323d1bf5ce576fc8104650d3c2441ca393b1fe70d555430caa15fa35b02811ef10 SHA512 2d0673f006c620441a8762c68da93eeb34d77772b3bd36834f5e363b7750380ffdf16c4e4d82414a1b2e2603b2c7a886918b0f5a70c604ceb43fc63433cff206
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
deleted file mode 100644
index bfae17481afa..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-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 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
deleted file mode 100644
index b170db612f20..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190403.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-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 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b6221b074a5a..6808a8eb50a0 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 70927dccc1c9..0993603c335a 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -2,5 +2,4 @@ AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec692
 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.34.0-r1.ebuild 4415 BLAKE2B fe9c3e485d7ece90ad6c4691ad31298fbfce7709738a69e0b78e6b222168417c91eee1a4bc86e96f75ddfea607d5a5245689772e19a664a47002e0509e975a3e SHA512 1a2050c5e8ddf1da9cc24440024a1099df92788e6413dfff6359f3cc3a7b8acbe8e256d78b6c3cb7522bb5f6dd2a5437b4814a0a7ee7206b646f3f3546c1cd0e
-EBUILD aria2-1.34.0.ebuild 4322 BLAKE2B 8348642130cd7dc2707a417a90385ee4c3c292a6375acd89f37aa698c6d146982316c74d8286ad5eb715fb9d0330f60ba2f4ae4c59d6bc7a768750de9bbac192 SHA512 cffd85573414498aa96533c4b04d033330dfd5b573ab60abebb8ff93d141c5f715e9d6083ef5f888c3581a188d076b7401a06207f9d023766e321833cefed9f2
 MISC metadata.xml 1195 BLAKE2B 393ba5f1d8bc975cbf2a7f4a7deef2929e5f8f3220895628535d5c9e78bb154c2b41a11628d4bfc30475936051c8b6975d6e1146dd4af612e10307572e6c361f SHA512 54ffe27c3c623befb40e1b66df8b4a6cfe9bc1101f65d6641ddc27de686cc0df600e72650f92c89402fdc30f535462ed1f0a6561967771a8e5c0d648890a9208
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
deleted file mode 100644
index 8da582d6b7be..000000000000
--- a/net-misc/aria2/aria2-1.34.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( >=dev-libs/libuv-1.13:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-make_unique.patch
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 976b8a50d666..ae643dfb8298 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST cni-plugins-0.7.4.tar.gz 862510 BLAKE2B 7ec9ec84614caecaca1583430552bd93606ae1f178f92cb4f7047ab47292084c5102437fbc9fdfe0ebf7043c94bb1b9fbb9d2ac0bc78abadb40da11cdd62b512 SHA512 2ffe18353b525d90679eca4950e96afcaadd7c387956ef5baaf4ce97c0550315fda63403161ab8f23df086955dc2a47da612fb8d0cdd30ccfe12649393e2242c
 DIST cni-plugins-0.7.5.tar.gz 862670 BLAKE2B 17734beabde562cfd52efd479cb24805681a3d8a8abd4fd9fdcf9dbd891b2d5b3026b84a880355388c893db147fd0952786a86716438e140a46cc9a2dfffe0c2 SHA512 7ab43f88b4763907f56ff26d684385e5a3f6314ffb4bcbe356ec33a014fc15207392bd26e2d3041e117c604a386d21841a37d093b04e003303554b03721b32c6
-EBUILD cni-plugins-0.7.4.ebuild 1063 BLAKE2B 5d07a8eb1acd7a42f5d24a309725d7a8df3192e7aa85f05f694024b4e65b7cdab3841796cc960bc13b5f615524de532fe81a4c08a5cc5930f3d6122339730298 SHA512 fd4fdbe92167dc99fed41991477d4a8cb52ace90525ea185ee86c37c75c2b5cf509f63dfe7c0b900f56ed8194f6c337779e57491c82277fae314a88fc5184a77
 EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
deleted file mode 100644
index 0fbcda6f9546..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.4.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
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 418528131568..8be8dcbfb944 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253
 DIST gnome-online-miners-3.26.0.tar.xz 272576 BLAKE2B d87a83489be58f3f78a9245bcb08c28afafab47008fc1d042d8c4964cc8451e7c257055768db88f384c75546d48ea90c477223987e0add757a1a5c614ef5a2b7 SHA512 a116a16c1f8a56bddd3cbb238cfb007d776695446c516dd12811145853553c293a9c8880465238571f6081fc7b05e3e69c14c406cd8e6fa6ee570b4aa4b22435
 DIST gnome-online-miners-3.30.0.tar.xz 273700 BLAKE2B 146777d6fcdbb2e17ca360e515de6f373bf74063240c579a1e39c0083aad9b0d908754c78046713b027b1b062cf279e0dbe58d211d0341a0179b1d179aa77a2b SHA512 de1d9281978b985d777c1b4900128c6a3b83ef9d0c905b4441f9683a6a03de992ce921e8094d43b903e8547436db51aced91d93bd0cf74f7a385a1d5a5e8b726
-EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B a6de18d767e2edfccaf829f1c5c422a65fc1ead85f15da115a6e978a53061c5719a40b09f341c5042d31dcd296c21516bb6f29725e274a20d061d9aa1cdeaf47 SHA512 a0f03e3ddae3d889835d0733b79022cb62ea1ae03f863edfab53e8d0904e7cef5628979891cf2d8217c112afd43755d297e0ffba9ee8ee1e4de53364e3547cd1
 EBUILD gnome-online-miners-3.26.0.ebuild 890 BLAKE2B 332268c34efc89e625d3585979720050ff6a7f6e315dd862f57a15947bf3cae11341f6f43197b7a5bbe315874d31f793b63b2531e7cfec94b4de0fedf4a10dbc SHA512 ab77d6dbaeba6a2e9405d22f339da291710ad9bddf46b7b9f224c00ee66a16b5d8c38179d2b968b48e4f6f1e96182a84c472a4e23c27003e4df37283e98b664b
 EBUILD gnome-online-miners-3.30.0.ebuild 892 BLAKE2B ec1b95d5a167917587efde2ae1f498b68aa767c204f06d6d0f02ef47d5e924c120bd96cbca656892fe08f0e0d8b164509d001affc201bc3d6c909225009a2d44 SHA512 2bb1e5d1b86dda67f25bdc157c0b80faff10b3c646fa8076953bac5bd4024cb104091e39a4589497da12f5227db04a8c8083ceec1c347fe705ff3ce57c8aee51
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
deleted file mode 100644
index ced494b6a8b7..000000000000
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Crawls through your online content"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="flickr"
-KEYWORDS="amd64 x86"
-
-# libgdata[gnome] needed for goa support
-RDEPEND="
-	>=app-misc/tracker-1:0/100
-	>=dev-libs/glib-2.35.1:2
-	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
-	media-libs/grilo:0.3
-	>=net-libs/gnome-online-accounts-3.13.3:=
-	>=net-libs/libgfbgraph-0.2.2:0.2
-	>=net-libs/libzapojit-0.0.2
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable flickr) \
-		--disable-static \
-		--enable-facebook \
-		--enable-google \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live
-}
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index 171521589b20..9b418f595a3a 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,3 +1,5 @@
 DIST istioctl-1.0.2.tar.gz 18828091 BLAKE2B 064e9ad8b2629809c7b55514ad0a537bae8785bfebabea610a54ead0a0e665cdc718218376e07dcf5e235f8674bdd9e2eaa7a79bfd5d5485a5ddc841e1c52527 SHA512 d444dd8e0676ac9b36dc3901595f15d6504991619a82057f924141f752d2a45866df9ca388d6c63e1fbe43be4d4156f3efc748be59b565f865a0c5b3d02bda07
+DIST istioctl-1.1.2.tar.gz 20682375 BLAKE2B bf0da863cade30baeceddcdaa358bce561a1848d018bd31890b2f0fb01e4ac908ca5da8d09a433fefae43c959c1aecba198ffd341c2c1f31de7a575abca973bb SHA512 6f9533f76b1847742198d48bed8fc2b0e288180d4033faf89857eb525c4d956f279a823c13196dd23fd9e46ab4261f9ff31746ac232e19530268d43cfdbaa083
 EBUILD istioctl-1.0.2.ebuild 881 BLAKE2B 00a7f516e13770c040062a00ed69f81978dd417bc99110642ae0be829db843f3102702d66dfffe25c0dd47cece882b0a32b1bfce7156e7f6f90d4e90722597db SHA512 4d97bd6fc977531321d9ad406b39e13546eabd2029887422acae435de2fc6c0e0c6d805ca8de15cde59392750a7862a561266b27cc7ad1ef0418816a104946d6
+EBUILD istioctl-1.1.2.ebuild 881 BLAKE2B 6c6dd07075fe58b1f8406ae71e0e7c0b9791f3a7728233ebe231f66410732fb42fc2171a4531e89f472a6d3dc4290aa3ea26d0ec910b05a440124d004040d62a SHA512 a99dd243544b5f981d737e7d30cd5967030d111d58229768e6347e7724c1947ccbb2e188673045b46c685ada2413e384cfa7a360dcbca6ced3560e9d27ecfdc3
 MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.1.2.ebuild b/net-misc/istioctl/istioctl-1.1.2.ebuild
new file mode 100644
index 000000000000..9ed0c95c5eea
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="2b1331886076df103179e3da5dc9077fed59c989"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 3d59b6221e58..e9d5c9a4ab42 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,9 +1,5 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.1.20190210.tar.gz 235093 BLAKE2B d86b4a73ebfe6b5f3665b92624e7eac36718fffea058c0e7d2cb4af2c0871534c7f7ec56ade6c3cb2e13215a77971173259f912efd61a37e41d0f2f0a4596e5c SHA512 d664d5f61a0e2e71086aa520cb91af9f7f9b8b34268a76d570bbca271d86eab4976655a1fec1d21be80a93e357a0cb185281037604a0cfc00e4944d8e8b6f664
-DIST miniupnpd-2.1.20190403.tar.gz 235909 BLAKE2B 121aa74d1337dbdaec280edd13a688c42c7af49e1f6d44cac94701e878fe554adb8b878ac2c075391124cee14b5c01d57987024fadf95e4508ed3b3047bad543 SHA512 63fbd09d769c7a8ffba92cd5724bc04e4553085b95405daa905ac77f95d2fbcf1852fd8ff7171e2fe39aac7ac76ebae87142fe5dc2e57932c89d8d98d472034b
 DIST miniupnpd-2.1.20190408.tar.gz 235989 BLAKE2B cdfb4fe23a136d9a3e0cc91c174fc4f0ee0a3e136305a2ea6d21c358287f67d34009b37ba8870bef86e53d056e441b45e19a89939e72485051245b5d40b384ff SHA512 f812660c1f626f1fdbcaabd6636125cc18f1306bb4a3a29dae45c06017c97c681e3e056d602fe5444962ecc1aec4d39d9c203621bb11a3aa1f57cda6dc4f19de
-EBUILD miniupnpd-2.1.20190210.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
-EBUILD miniupnpd-2.1.20190403.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 EBUILD miniupnpd-2.1.20190408.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild
deleted file mode 100644
index 673b340fb090..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-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
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-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.1.20190403.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
deleted file mode 100644
index 673b340fb090..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-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
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-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/rygel/Manifest b/net-misc/rygel/Manifest
index f6fb362c7de7..ae94a7bed8af 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.34.0.tar.xz 3997364 BLAKE2B 2906bcdea61caddd93a7fa0363c7957ce3c0443581a625b40712d2c75f25d05c693b745f72392c917190f754533c03c524fefa80799a5e8163f44eb22c1d33da SHA512 90e582f42e73376bbe6b06f33d44c6a70969961728dc512523bcc578b5b7c3f826cb425b469ade87d3fdf82117309f8589c30b1cdd8ba74cc14424c7f2efdb21
 DIST rygel-0.36.2.tar.xz 4057356 BLAKE2B 3ff1a0df12cdda694ded3a9a5c6d1495eaf0dff7133cbc84b73ad6bc767cd3a5e31ff8b579aff9c0de455f149e49dc972f7d93d64424d25501b02f2a02f66552 SHA512 8c079f83a00c9ad237b634e6274d27acc94a91adfa2829f0336b2485aa801e6898c30ec7268352247f1d12232d9ab3cb7a6f8215370f03aaff5323c4a8fdff7f
-EBUILD rygel-0.34.0.ebuild 2651 BLAKE2B 518b3e3e465bcfaa3e4cbe9db9b6b28cd57493b49c1d3e4fd5bc5fb793b1f4801632111c7cb05fd43ca81949ed134ad200202d7d090f2def68fcdeb24dcd4c97 SHA512 392b4fe250733a535fa6b6a0c35e92fe1d4798a5f7cee6f4fdc6a62b02c2196397a857ca5ad0850b122ed59bb75e6b49a04a173bf95f1140d922631fd184f3cf
 EBUILD rygel-0.36.2.ebuild 2172 BLAKE2B 2ba08491b403ac96e2d66bd7374bfec6dbb599821de4f954d098bb9251c3c3eab10518df93837f6be7632e045acba251f3bdd805023d17a5ea276873f774d6f2 SHA512 511b19f3e10ac9f66624a13e6a2f37f4e87416ebf47109399ddc9aefbbdbd71d0678fe55bceda17397c4c1fc83469de3e7d8c0f25a30caa2aa3a5a900a4d5232
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.34.0.ebuild b/net-misc/rygel/rygel-0.34.0.ebuild
deleted file mode 100644
index 67c693981748..000000000000
--- a/net-misc/rygel/rygel-0.34.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd versionator virtualx
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +introspection +sqlite tracker test transcode"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmediaart-0.7:2.0
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-0.13
-	>=net-libs/gupnp-0.20.14
-	>=net-libs/gupnp-av-0.12.8
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:0/100 )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	X? ( >=x11-libs/gtk+-3:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.22
-#   dev-libs/libxslt
-
-src_prepare() {
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-		-i tests/rygel-playbin-renderer-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# We set xsltproc because man pages are provided by upstream
-	# and we do not want to regenerate them automagically.
-	gnome2_src_configure \
-		XSLTPROC=$(type -P false) \
-		--enable-gst-launch-plugin \
-		--with-media-engine=gstreamer \
-		--enable-nls \
-		--with-systemduserunitdir=$(systemd_get_userunitdir) \
-		$(use_enable introspection) \
-		$(use_enable sqlite media-export-plugin) \
-		$(use_enable sqlite lms-plugin) \
-		$(use_enable test tests) \
-		$(use_enable tracker tracker-plugin) \
-		$(use_with X ui)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.28.2-r1 ${v}; then
-			elog "This version stops forcing the automatical starting of"
-			elog "rygel as upstream pretends. This way, it will honor the"
-			elog "user settings at Sharing section in gnome-control-center."
-			elog "If you desire to keep getting rygel autostarting always"
-			elog "you will need to configure your desktop to do it."
-			break
-		fi
-	done
-}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 897791dcb103..1f8afa2a256c 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -2,8 +2,10 @@ AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9
 AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
+DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce SHA512 6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbec99df447668b0eff67d82eaa1cb513c74e6f58d927969f110baa38b5055c2015e6dc837064e3e2f1dbb63b214 SHA512 9c60d66cf7b190cb41d2d2afb2bba5bb3982c301df5f8e989013d4d7e32a2b15ddccbb26a4d2ef84f65412e24efbe85530e7178d03b2ad86d78d7addec9a8c63
+EBUILD socat-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
 EBUILD socat-9999.ebuild 1387 BLAKE2B a0493a52e072941134d4673eded87efa4cf717778e30f61da0d81bc5737b584766955fa8edeec772ccd9ca4cae260e1904cff92dd43f27e94cbd2b8aecf35bf7 SHA512 e08b74b67d94b9997665465f5cd8b77f53e268b3dc5e83c6aba27cbbb9c97cbd4f3cf577b8bf865f36c9cd3719fd2dbd7ec7f6a4084601b88a9dce222bc583fe
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/socat/socat-1.7.3.3.ebuild b/net-misc/socat/socat-1.7.3.3.ebuild
new file mode 100644
index 000000000000..5d48079d56cc
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 543ab3042468..7ee9196504c3 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,5 +3,5 @@ DIST wget-1.20.2.tar.gz 4486237 BLAKE2B 7392e445cb801ac5fafee804e6b0459d0a001b91
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 EBUILD wget-1.20.1.ebuild 3188 BLAKE2B a341244ebf21c99c63082e3fa47fb7c146be73ebafaa8d8a2b5210da7c2dd339873456a9b3e5b4560d7459a6e72259b6e7663486412a365af9c9d81d8e47a704 SHA512 8fa5048e8dd8a42ca12c86aa7f09e3268a35d165c51fd7081a3ca85c3e127674a1f66983b9eb9375a06db74db7e45d73b8e2af5979e75ee7d6846339763b3ad5
 EBUILD wget-1.20.2.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
-EBUILD wget-1.20.3.ebuild 3197 BLAKE2B 03968ac24566118d2a7c3f7e85663fa764a5161aa0c81b115b200fb44847cff115c893f7f8f5d7d52713bc8022719934e8b33e13d40fa5921d5720db44386f8a SHA512 f9c5b540e21a12d53f408b09b5a82df846113a4f73dcdc2b74b8f28345b362d9e0fd6138ea5ab4ccfa98fdc21bbe5d4d52e58755f961cca4ae92059a36eac6e1
+EBUILD wget-1.20.3.ebuild 3195 BLAKE2B e9e92c4a64a6957d437784bc2c0e3f488bc866d49ed272a461f26d9e6b39074d146b2a6f59e3525ccdb05224d1d57f8c65c21b980c0266e3a6bd96f23f7778d8 SHA512 ae8be16dfb3c531f4ebddef49fe003a5dfa40f61767dffac242014ed49b123e0a34d275e361737d074601421fb777a0ec4cadd049628a0976d0c2f48984e1cd2
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.20.3.ebuild b/net-misc/wget/wget-1.20.3.ebuild
index 86d3295a988d..f5f166c89c53 100644
--- a/net-misc/wget/wget-1.20.3.ebuild
+++ b/net-misc/wget/wget-1.20.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1321c7e30957..ec0fec553dc6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2019.04.01.tar.gz 3129663 BLAKE2B 0ab60ad7acad323cfc2f62a5066e4c58405302813abf21ff020a94ca23a72995930e76cad9f91cea28db6014a42a7ed8c9380db8dfe8dde846c8d951997c2bc7 SHA512 656fb3bc88648db72a88657d0b6fa104bb463ee8f5eb1cdc969c5869c83ab83cf192883912e091e98abd308151a6e0ba12ad0c9b356988744041850bc6b31cef
 DIST youtube-dl-2019.04.07.tar.gz 3139592 BLAKE2B b9b8ead15aad94e53aa92dcb7969d56138d0ec139917491710a1c86c7121a5288bbc2b443af261892e97a755e0b466a261fcf7bcdc255877313f5c2d6627d775 SHA512 9c4544f1e4437980d289127342aec1bbb93669a1ef9abde5cde20c02a153a4429f18df85fa61c6c040ea2df5987ed7d7ae4ca57684921de4f9640e8403948dc6
-EBUILD youtube-dl-2019.04.01.ebuild 2117 BLAKE2B 5083bf39fb89c96f03b9d4b68353e30716c2649a502024e3116ead883c4007fdf291eee380b94259df2fa319baf78905288288278ef4b91a1629ad7e51d73616 SHA512 d8adef117e465905f79aed2ae691e136a3bae7c8f530f771750a98e661a018852ab499f71baebd39047213813ed382ecd88c46efc0f592264713e18c893d5ea6
-EBUILD youtube-dl-2019.04.07.ebuild 2123 BLAKE2B 30c7bf09ce71e92554aa3149fd27be0dbb3608bb35303a496dc4b1388be8a5e67bee450d6d1ca185637c2409f74f52e0aeaee3dcaac30a3f3c57de092c4e2d17 SHA512 d86d5fe4dcef4cd09f200ebc9ff39a9eecc578522c1bfe8914f41fb16ebf525897511ed9114688c9b2172421f728f6608effa3521c75d2b1d11c47972b481139
+EBUILD youtube-dl-2019.04.07.ebuild 2117 BLAKE2B 5083bf39fb89c96f03b9d4b68353e30716c2649a502024e3116ead883c4007fdf291eee380b94259df2fa319baf78905288288278ef4b91a1629ad7e51d73616 SHA512 d8adef117e465905f79aed2ae691e136a3bae7c8f530f771750a98e661a018852ab499f71baebd39047213813ed382ecd88c46efc0f592264713e18c893d5ea6
 EBUILD youtube-dl-99999999.ebuild 2012 BLAKE2B 7ad819e850d30622c7b7e4c6ab21a5f3a0e3a5cbf9ab8f3c12f7e6c93ff8074a63f4b69ac1fd7ccb5bc9453cf298853756778e841a3f8988ee5c24e4a79f5c62 SHA512 2e5bfc2fa48edd888371b396bb09ba84a239ee0cc89ea80c39a5dd05bde5177935f5744dd2d1f7e9c0a18eca9a2014253a4fb9485129bbc68875f0fa030e92f0
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild
deleted file mode 100644
index 38bace475e54..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/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"
-RESTRICT="test"
-SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-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 avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "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 "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-2019.04.07.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.07.ebuild
index 8249fc9c0e19..38bace475e54 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.04.07.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.04.07.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/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"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 DEPEND="
diff --git a/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild b/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
index 035f0222aea7..85118386e802 100644
--- a/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
+++ b/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for creation and manipulation of tar files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/perl-core/Archive-Tar/Manifest b/perl-core/Archive-Tar/Manifest
index a91fcf5eab97..ba9fe45c6a7a 100644
--- a/perl-core/Archive-Tar/Manifest
+++ b/perl-core/Archive-Tar/Manifest
@@ -1,4 +1,4 @@
 AUX Archive-Tar-2.30-makefileptar.patch 4240 BLAKE2B 144c1c552d27bc8b90a16e29ceba0a2ab7ffbb1f71325757014b7474e66d96f9c5a992e468967a7065c9dccc333313506ccd6b240d91f25ade8c9454b3a84b82 SHA512 34f70f18b6e8607d39feb0673c3b8263145b408465b96465262a46b0fe4b57a3d26d7520ea0f410befa35d7d8439e6636b31f0b7d56412bd11f662623aab14f8
 DIST Archive-Tar-2.30.tar.gz 63693 BLAKE2B aa7d1697984d76211e66d50488de1b7748f45187b7da946570342c7e9fda508325f1b9dc1263a5fc54d57809a91fc685b188de4c181c6935da0d2c18344c12e2 SHA512 7be2745d7c5b73cec9ef66968e6f28a4d4dcc0d80b41861e3aa2d4c27ba6c013cce6a87bba8a626888fcaa0d4ebecd17a7b09324215876f79ca9f39d671aed4b
-EBUILD Archive-Tar-2.300.0.ebuild 1324 BLAKE2B bcd52766f8bcc266c286cfcc3b2b1a3decfb04e209dc1b8933826d0af90e3757730caa0749f59a12278a8286ded91f5c2cec66b303366ffb825668fd65ee7aca SHA512 34ec01d1f27e473df674e6a3d9d231de4e1eeb2f4bb8477a7611451a9e9a289594a42de4a43870fba77820a100b1c748af6339597516c6af103537f429eb6e63
+EBUILD Archive-Tar-2.300.0.ebuild 1323 BLAKE2B 3959c0d29dbc01fd47116eedfbd5dd067b7739cafce963d5de82719ac965162b6d842a6d0a1f7bcf38d4244063da798d8366175269932e0a5e223a02005ee028 SHA512 f311650a583d265567dfef4bd0dfd04c0daef2fcd9fc3a993290f05fd4f4043e46d5d70021dba265b870790a4112ba12c5a92e8b05cacf441e01eb6b63a881c3
 MISC metadata.xml 512 BLAKE2B 7b8b402a8e0a0e6d47e2c560c3329405f122a1442b224cb39df5e6944be1cf0957e73b559b8c0c8383b854f4d44fd17bcc9608805ead1297f0e1ba72676fd3ba SHA512 5bb14f1b5f7b9e03294fb6c3934728f37ecd78228d1b920b77a58ecab2589ca8c6258be023cc5b2fb879c86dc74978f152bfcd95ac1fc5ada33d97b295df9ec7
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 1e43c61895f2..03e1a9e2d0d4 100644
Binary files a/perl-core/Manifest.gz and b/perl-core/Manifest.gz differ
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 10db5f63fcb9..74aaa400b1f4 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 97c7a2ddd346..271af38a49d3 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,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> (10 Apr 2019)
+# media-sound/aacplusenc is slated for removal.
+media-video/h264enc aac
+
 # Michał Górny <mgorny@gentoo.org> (31 Mar 2019)
 # dev-libs/grok is slated for removal.
 app-admin/rsyslog grok
diff --git a/profiles/default/linux/arm64/17.0/musl/eapi b/profiles/default/linux/arm64/17.0/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/musl/hardened/eapi b/profiles/default/linux/arm64/17.0/musl/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/musl/hardened/parent b/profiles/default/linux/arm64/17.0/musl/hardened/parent
new file mode 100644
index 000000000000..488bf0d8c2c3
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm64
diff --git a/profiles/default/linux/arm64/17.0/musl/make.defaults b/profiles/default/linux/arm64/17.0/musl/make.defaults
new file mode 100644
index 000000000000..d9ba618fa184
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/make.defaults
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="aarch64-gentoo-linux-musl"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
+# Multilib-related setup, bug #515130
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+CHOST_arm64="${CHOST}"
+LIBDIR_arm64="lib"
+
+# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/arm64/17.0/musl/parent b/profiles/default/linux/arm64/17.0/musl/parent
new file mode 100644
index 000000000000..a340ae545671
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/musl/
diff --git a/profiles/default/linux/arm64/17.0/musl/use.mask b/profiles/default/linux/arm64/17.0/musl/use.mask
new file mode 100644
index 000000000000..e6145791eeca
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we cannot use it.
+multilib
diff --git a/profiles/default/linux/musl/arm/armv7a/deprecated b/profiles/default/linux/musl/arm/armv7a/deprecated
new file mode 100644
index 000000000000..2300c15ba6cc
--- /dev/null
+++ b/profiles/default/linux/musl/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/musl/armv7a
diff --git a/profiles/default/linux/musl/arm64/deprecated b/profiles/default/linux/musl/arm64/deprecated
new file mode 100644
index 000000000000..fd62fe78077a
--- /dev/null
+++ b/profiles/default/linux/musl/arm64/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/musl
diff --git a/profiles/default/linux/musl/ppc/deprecated b/profiles/default/linux/musl/ppc/deprecated
new file mode 100644
index 000000000000..47463d6e50fa
--- /dev/null
+++ b/profiles/default/linux/musl/ppc/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/musl
diff --git a/profiles/features/hardened/arm64/eapi b/profiles/features/hardened/arm64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/hardened/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/hardened/arm64/make.defaults b/profiles/features/hardened/arm64/make.defaults
new file mode 100644
index 000000000000..bc6776d156e2
--- /dev/null
+++ b/profiles/features/hardened/arm64/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+USE="pic"
diff --git a/profiles/features/hardened/arm64/parent b/profiles/features/hardened/arm64/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/features/hardened/arm64/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index 46c03330afb4..a6ebbb5f4d44 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -5,3 +5,7 @@
 -elibc_musl
 elibc_uclibc
 elibc_glibc
+
+# Musl doesn't have support for utmp/wtmp by design
+utmp
+wtmp
diff --git a/profiles/hardened/linux/musl/arm/armv7a/deprecated b/profiles/hardened/linux/musl/arm/armv7a/deprecated
new file mode 100644
index 000000000000..97118bd98bd2
--- /dev/null
+++ b/profiles/hardened/linux/musl/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/musl/armv7a/hardened
diff --git a/profiles/hardened/linux/musl/arm64/deprecated b/profiles/hardened/linux/musl/arm64/deprecated
new file mode 100644
index 000000000000..b78b64e11c9f
--- /dev/null
+++ b/profiles/hardened/linux/musl/arm64/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/musl/hardened
diff --git a/profiles/hardened/linux/musl/ppc/deprecated b/profiles/hardened/linux/musl/ppc/deprecated
new file mode 100644
index 000000000000..031f987bc7e7
--- /dev/null
+++ b/profiles/hardened/linux/musl/ppc/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/musl/hardened
diff --git a/profiles/package.mask b/profiles/package.mask
index 16add49060f7..a18fd56f5c44 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (10 Apr 2019)
+# Unresolved vulnerability.  Last apparent upstream activity in 2015,
+# with the code last touched in 2010.  Local patches are already
+# necessary for it to build.
+# Removal in 30 days.  Bug #630254.
+media-sound/aacplusenc
+
+# Michał Górny <mgorny@gentoo.org> (10 Apr 2019)
+# Fails to build for more than 3 years.  The project has been abandoned
+# upstream, with the current (and last) release made in 2010.
+# The author itself suggests media-gfx/eog as a replacement, though
+# there is a plenty of other image viewers worth considering.
+# Removal in 30 days.  Bug #561392.
+media-gfx/gliv
+
 # Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
 # Obsolete XFCE library with its remaining dependencies.  In all cases,
 # the relevant plugins have been abandoned upstream and the upstream
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 26ec3ee66d3b..eab4d48a2c4c 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -334,23 +334,18 @@ ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
 amd64		default/linux/amd64/17.0/musl				exp
 amd64		default/linux/amd64/17.0/musl/hardened			exp
 amd64		default/linux/amd64/17.0/musl/hardened/selinux		exp
-arm		default/linux/musl/arm/armv7a				exp
-arm		hardened/linux/musl/arm/armv7a				exp
 arm		default/linux/arm/17.0/musl/armv6j			exp
 arm		default/linux/arm/17.0/musl/armv6j/hardened		exp
 arm		default/linux/arm/17.0/musl/armv7a			exp
 arm		default/linux/arm/17.0/musl/armv7a/hardened		exp
-arm64		default/linux/musl/arm64 				exp
-arm64		hardened/linux/musl/arm64 				exp
+arm64		default/linux/arm64/17.0/musl				exp
+arm64		default/linux/arm64/17.0/musl/hardened			exp
 mips		default/linux/musl/mips					exp
 mips		hardened/linux/musl/mips				exp
 mips		default/linux/musl/mips/mipsel				exp
 mips		hardened/linux/musl/mips/mipsel				exp
-ppc		default/linux/musl/ppc					exp
-ppc		hardened/linux/musl/ppc					exp
 ppc		default/linux/powerpc/ppc32/17.0/musl			exp
 ppc		default/linux/powerpc/ppc32/17.0/musl/hardened		exp
-x86		default/linux/musl/x86					exp
 x86		default/linux/x86/17.0/musl				exp
 x86		default/linux/x86/17.0/musl/selinux			exp
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 786ec8004d8d..053d67c7c9ef 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1065,17 +1065,8 @@ app-misc/sphinx:stemmer - Enable language stemming support
 app-misc/task:sync - Enable "task sync" support
 app-misc/tmux:utempter - Include libutempter support
 app-misc/towitoko:moneyplex - Makes libtowitoko work for the moneyplex home banking software
-app-misc/tracker:cue - Enable cue sheet parsing
-app-misc/tracker:firefox-bookmarks - Install bookmark data miner plugin for www-client/firefox and www-client/firefox-bin
-app-misc/tracker:gsf - Enable gnome-extra/libgsf based data extractor and for ODT.
-app-misc/tracker:iptc - Enable extraction of IPTC data from pictures
-app-misc/tracker:iso - Enable extraction of metadata from ISO disk images
-app-misc/tracker:miner-fs - Enable tracker-miner-fs (required for filesystem indexing)
 app-misc/tracker:miners - Install the app-misc/tracker-miners package for actual data mining support for tracker
-app-misc/tracker:playlist - Add support for playlists
 app-misc/tracker:stemmer - Add word stemming via dev-libs/snowball-stemmer.
-app-misc/tracker:thunderbird - Install email data miner plugin for mail-client/thunderbird and mail-client/thunderbird-bin
-app-misc/tracker:xps - Add support for XPS file format through app-text/libgxps.
 app-misc/tracker-miners:cue - Enable cue sheet parsing
 app-misc/tracker-miners:gsf - Enable gnome-extra/libgsf based data extractor and for ODT.
 app-misc/tracker-miners:iptc - Enable extraction of IPTC data from pictures
@@ -8794,6 +8785,7 @@ www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
 www-apps/kibana-bin:x-pack - Enable additional features (may need a license)
 www-apps/klaus:ctags - Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions
+www-apps/netbox:webhooks - Enable webhooks via django-rq
 www-apps/nikola:assets - Support web asset management through dev-python/assets
 www-apps/nikola:charts - Support chart generation through dev-python/pygal
 www-apps/nikola:ghpages - Add support for direct uploading to github pages thru dev-python/ghp-import
@@ -9239,7 +9231,9 @@ x11-terms/rxvt-unicode:perl - Enable perl script support. You can still disable
 x11-terms/rxvt-unicode:pixbuf - Enable transparency support using gtk's pixbuf
 x11-terms/rxvt-unicode:secondary-wheel - Support for wheel scrolling on secondary screens (like mutt). Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html
 x11-terms/rxvt-unicode:unicode3 - Use 21 instead of 16 bits to represent unicode characters
+x11-terms/rxvt-unicode:utmp - Enable utmp support
 x11-terms/rxvt-unicode:wcwidth - Enable wide char width support
+x11-terms/rxvt-unicode:wtmp - Enable wtmp support
 x11-terms/terminator:libnotify - Enables desktop notifications viadev-python/notify-python
 x11-terms/terminology:extras - Install additional testing tools
 x11-terms/xfce4-terminal:utempter - Include utmp management support via sys-libs/libutempter
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 5d5741f160e1..8f9d1104cd6c 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 0deb347d0de5..68af5cfef23f 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,6 +1,7 @@
 AUX 64gle-gentoo.el 161 BLAKE2B 89fd74e68819e2f4653861a110ba977f205e2a200810c03f81297c87ea55167aec2dfcee87b187d310516fd36dd04e365afcaf8fa17c4691b4847071f2a35ad0 SHA512 eda9f1f3ef933aa9f43054c7eae6ec9200022723d91259fb6ba42ddbfbd01f8953d4dcd9aa541211b054c6c93947d7cada1db599db046443b90451cce9e3d7f8
 AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a60662de730a73b5c7917f1f64a6a2c10472a7f4ba8ae49f8860ba72e919385b863de74878933e3c8022e246b SHA512 aef210745cbf2deb265fde3839e5156eadd52d28029583b52bb53a9e2db26f6dfc6fd2243626be67ae6d00b1e0dbd1b03ed32f594541a569b1df289e78d8d367
+AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590
 AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
-EBUILD gle-4.2.5-r1.ebuild 2134 BLAKE2B bf4ea6ed5aed48ee23ea93bfbeceb9ff4031acf648629a1725d11dee5d0111af625fd502ac8ec5cf4ad02845e81500e2e4b5315f1458fd72fa9835fca1c23c96 SHA512 b8b7a648fb506ffc380dc287881def9116295a1447339268c9f064ca73f3410847c8468db4bf0682a34509c01a2a790555512d0cac880c4a3402e422678cb5af
+EBUILD gle-4.2.5-r1.ebuild 2161 BLAKE2B e94da948677a2a62a2668048c7953663a4053f29519034bf661a624361293236bd35904b6bef011639b830e36170531741bc35bb38c5b8b11b6f150686319fb7 SHA512 cfe7661a042e2ff0b3cc16f20d779757b8588243265d4c5cdb6718a72ff6d9d3c870b076b7908e70fc98fd416587cca9ca88e1f52ee91b63b7f799835c881929
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
new file mode 100644
index 000000000000..c5dd2205dc43
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/647626
+
+--- a/src/gle/gle-poppler.cpp
++++ b/src/gle/gle-poppler.cpp
+@@ -194,7 +194,7 @@
+ boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) {
+ 	gle_jpeg_term_destination(cinfo);
+ 	gle_jpeg_init_destination(cinfo);
+-	return true;
++	return TRUE;
+ }
+ 
+ void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) {
+@@ -237,7 +237,7 @@
+     	cinfo.in_color_space = JCS_RGB;
+     }
+     jpeg_set_defaults(&cinfo);
+-    jpeg_start_compress(&cinfo, true);
++    jpeg_start_compress(&cinfo, TRUE);
+     JSAMPROW row = new JSAMPLE[cinfo.input_components * width];
+     JSAMPROW row_pointer[1];
+     row_pointer[0] = row;
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index c9157c018093..f0d2a19ba6ab 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,9 +30,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-parallel.patch
-		  "${FILESDIR}"/${P}-c++14.patch
-		)
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel.patch
+	"${FILESDIR}"/${P}-c++14.patch
+	"${FILESDIR}"/${P}-jpeg-9c.patch
+)
 
 src_prepare() {
 	default
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0c4574183ace..ec0b87451bcf 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 077c7b8f1c8c..9a2118d5a35b 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,3 +1,3 @@
 DIST bubblewrap-0.3.1.tar.xz 209924 BLAKE2B bacc4080106cd9876bf0e1ad866a7397d7d232e61a720b52b5a6b9b0d860e625511ed15ac630aa71003fb9fa145ffa9d08ae2e6ba6d1411fd75e7d9568312717 SHA512 74e36caa56540a956158445f5f38c7ac5f7ff3c733ecaf85893de4607900e1fe4050db86a4435cbe18d722e90c5b39c466c555ea8ea8d4944da6207ef1011d67
-EBUILD bubblewrap-0.3.1-r1.ebuild 1048 BLAKE2B d46fbf29736539a20908b44109922a3b5257cce8d69845e1c54444dd04f50a3e51d709eba90dc4465c8ac5ff48440a0f2df39614555f183af04881c94028e9f4 SHA512 a45244a09005f1f621d82e585be8ea2ddfa63d444825f3c9825b8f9e80e9a54b2ad1e9174fe4c270249a2940f9d518cf926a8177fb429e452dc8df43b6255749
+EBUILD bubblewrap-0.3.1-r1.ebuild 1055 BLAKE2B eb9c2fa9540f631f06a68fa3e399ab7f807256b56edf5d4595af6aacaa97f33db587f6ba4c263e8ddd74d4828a9a63e2f7695571c5567b062e0546b4c2f6f290 SHA512 c478ffad9561126502196e0e6107cd15574605614558af089209586653c8d67db12873c5eca7c4957ba986551d4272f862b55dfa9a02c98f1dfe0afbfbee4e25
 MISC metadata.xml 342 BLAKE2B de8d3ba1c95b39bd6e582b27b186ef0805fd9be1fe6c806fb8bcfa28f7cafb3a2068be0e21baa13ca08895db0d0b666b5c1eab573f38fac251ce9d41c793866e SHA512 25752c1aae465ac49409e35c32863b945c1dc8989ddb4fab2999cf890cf4ec33fc82e9324e3af49c15a8580a566e5f737ec270646b4cc569c3c5dd472eb1b2bb
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
index dcba78156b3a..30d908bc60d0 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 7965dde90c9c..7805401d91d5 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -12,5 +12,5 @@ EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af
 EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
 EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
-EBUILD collectl-4.3.1.ebuild 840 BLAKE2B aa95cdcaacd67a4db5d59ea173d628941ac43bd7148c086d27e6ed2b47e28b8f57b5ea84184f9aae8e5a81463a2de6263ad2ebe5d4cccd2f710715b0909270c1 SHA512 ac858b33e0c72e5ff77e0b132f953d4d1e662bf9d87aa36c1a85e53ff1ab1dbd425b7353e328a741206461f576c3b801c36e3f176e6cb23e0bdf9fbc0779a538
+EBUILD collectl-4.3.1.ebuild 839 BLAKE2B 7d25b3fd2e7118c310c420127555c10bcafc3b790b6415c32a06c5f4acfdde4d6d94366d85c35c702bf97b63fd36f804c7e1d7ec0bd886dfe74abc3b89a3dc6f SHA512 230a8fd6fe0bb213a6a7b62aede8cd71b1ea95fef76222784c6489d042b5449b63cc71492b99bd973aff84d9084869a8adc87736e1f057f4756a7a6460bf8c73
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-4.3.1.ebuild b/sys-apps/collectl/collectl-4.3.1.ebuild
index ba9800dc9fba..7ffa8740f70e 100644
--- a/sys-apps/collectl/collectl-4.3.1.ebuild
+++ b/sys-apps/collectl/collectl-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.8
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index c7407c601986..c331e53bbb54 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,8 +4,10 @@ AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BL
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
+DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 EBUILD util-linux-2.33-r1.ebuild 8364 BLAKE2B 5c947964d771de3126ae067d91ada70baadc42705eef4757ad51e27258d1fe43757014ea647da40ba5cc2afe313c8e9b5443e9a625618f90b2b1ab6afdeb871c SHA512 4eee994d6fce8689d1237e997ad4813be0db3dd428ae57c963f659958dbaa8754515cac33d6acce5cd65c37f00a3c90135b4d980d693dcfd57e546fcebe60401
-EBUILD util-linux-2.33.1.ebuild 8628 BLAKE2B ee4d9ac302d514dc99d6cb051d35aeb91290a43d82050b9773dfc488f40091a008d53c6c3f3dc2e90f0a9517e1b76d149a8d9926f264cd87dc5cb5ff90894e20 SHA512 9879577a284d932c67799967cc41f183aaffc825ecae2903316ed304d4c4663211a873470b9cd1c69b52dbfe8ed8f0c92cc5f5b008e4d5291aa797484c3f6c37
+EBUILD util-linux-2.33.1.ebuild 8633 BLAKE2B e97b3614c94285a1f1f1f016714a9614434bf8d173e2f30e08dbcdb04c9e87d80da33a38617cf86cc30199e1f232238c51cfaf5cafc3a2682253ce156f243224 SHA512 2b0a27975897a4ac8180444aee642296441336c57a0fd6d9b7ab182b7cc57799d6f21e178f1b70279c765f98ce67539c977c11bce329f238acfd5416acce5df4
+EBUILD util-linux-2.33.2.ebuild 8641 BLAKE2B bfa818cfac5bfee6566c085276d9bcecf62f3f0a131a13b3d3d2b6c92851a0eefe3ac55dc8f3e9697c072498101f7d544d172adc6a0cf22532036e02f714640c SHA512 76ea0d8a05350fa1ff08e4b0f198fe020b95572136025274d8083406dfbb93f408f19cd8f42575c5d6055317950f085d9effa73f7520afee38efd2646ce15a46
 EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild
index 503832c70fa6..aae182dbf8fc 100644
--- a/sys-apps/util-linux/util-linux-2.33.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild
@@ -63,6 +63,15 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# In glibc-2.29+, a lot of changes were made to arch-specific
+	# handling of `struct termios', which breaks atleast MIPS.
+	# The below patch from upstream fixes this, and should be
+	# in the next release.
+	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
+	"${FILESDIR}/${P}-fix-struct_termios-check.patch"
+)
+
 src_prepare() {
 	default
 
@@ -90,13 +99,6 @@ src_prepare() {
 		configure || die
 
 	elibtoolize
-
-	# In glibc-2.29+, a lot of changes were made to arch-specific
-	# handling of `struct termios', which breaks atleast MIPS.
-	# The below patch from upstream fixes this, and should be
-	# in the next release.
-	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
-	epatch "${FILESDIR}/${P}-fix-struct_termios-check.patch"
 }
 
 lfs_fallocate_test() {
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
new file mode 100644
index 000000000000..f77f0a1fa084
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2019 Gentoo Authors and others
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+RDEPEND+="
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	!net-wireless/rfkill
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# In glibc-2.29+, a lot of changes were made to arch-specific
+	# handling of `struct termios', which breaks atleast MIPS.
+	# The below patch from upstream fixes this, and should be
+	# in the next release.
+	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
+	"${FILESDIR}/${PN}-2.33.1-fix-struct_termios-check.patch"
+)
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	# Undo bad ncurses handling by upstream. #601530
+	sed -i -E \
+		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+		configure || die
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	local myeconfargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(use_with ncurses tinfo)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index daf69a5a263c..bed92eaacd79 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 d51947292d42..a81ab3c59317 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,15 +1,19 @@
 DIST keystone-14.0.1.tar.gz 1526741 BLAKE2B 5ae1a6f0e7a7ce737b3a0fdbd2900e8cb1541ec3b1e08228d4abf58d8021a06a6c9db654ef71c22636436f2601bd49d4934f24650e2a44c101c9610ed7b011af SHA512 87065a16ca70dc9115d331f1e0f3669ac9661f5172f9e8afbecef48e7dd9a4726438b4d757fa54bbd6095a5543427dc913f90a765e83ffb30284b1f8dbfbb8e7
 DIST keystone-14.1.0.tar.gz 1467270 BLAKE2B ed4bd8a109fe80577d210a09ddb1e49d61cee329f52ded02dfa36d7996089b62b7570bdea3d4afd69d51e91183f6011b6ab69842d4b0463efc22e5140be7e02b SHA512 ab2462f7d4bec19b37e0a482f19fd6cac3559d3fcb2422488646f18590a955bf324c260ca69f34c192508833378bba56c5ef21ee44c653dec50e3dc6e7b65425
+DIST keystone-15.0.0.tar.gz 1620138 BLAKE2B 35a8800bb25e40f01837624058d62bf829e50eefe20953785dbbb9afc646c0178031b3d8b7a02e6f9b2b273294f1acdb7ac2c17e8200929cf8dbaac5dbf284ed SHA512 b88f4ca95167a8cf0d1ed5891d692de43d43e95706b6efe8317ecc7356ee69eef85580d6f37dc9a31279c2127db946528fcd2b3612b43ccf6b952f88be097b01
 DIST keystone.conf.sample-14.0.1 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.conf.sample-14.1.0 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
+DIST keystone.conf.sample-15.0.0 109344 BLAKE2B 72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f SHA512 b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
 DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.conf.sample-2019.1.9999 109344 BLAKE2B 72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f SHA512 b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
 DIST keystone.policy.yaml.sample-14.0.1 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 DIST keystone.policy.yaml.sample-14.1.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
+DIST keystone.policy.yaml.sample-15.0.0 6644 BLAKE2B f983189bc8e855db0b1ae92b1066840f3dd13545a1ce8af22be877df1630816fa8fae36217a828d483385e199ede73066b14beb421fe57316ae82a83e851e0f9 SHA512 e358661d4ec363ab11d7d78f6324bbe42c3382b02a1a8579de79686f7c91fe1a09b612ea81138bfcef73f0391262c9fceb3af14e8a8728839b203d281a989c4f
 DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 DIST keystone.policy.yaml.sample-2019.1.9999 6644 BLAKE2B f983189bc8e855db0b1ae92b1066840f3dd13545a1ce8af22be877df1630816fa8fae36217a828d483385e199ede73066b14beb421fe57316ae82a83e851e0f9 SHA512 e358661d4ec363ab11d7d78f6324bbe42c3382b02a1a8579de79686f7c91fe1a09b612ea81138bfcef73f0391262c9fceb3af14e8a8728839b203d281a989c4f
 EBUILD keystone-14.0.1.ebuild 6745 BLAKE2B dfa88d3773cd388b1f01fa03667b80643a3deb4cbfbbb4fa3d1febc3e53cb12a41560e92e9b275224a869b5c2c4c8f6479a0154c3b471827fc94fe506ba85242 SHA512 a194f98e0dc066a70dd4afd55d8f9aab68560087121c55cca2bf12b8bca7dcaffab2984eda0417bd2fe77b084a58d788244a3d58b796f8b17ffc3978c5c01c2f
 EBUILD keystone-14.1.0.ebuild 6747 BLAKE2B 8a8d06371fb4fda23f85607e8f3b3b9f3adc09d9cec54f9fad090b461cb39e3cf2a64e987423dc79ecd9422cb10f3983d7a63442f76d162428f3f4e048cee1b1 SHA512 40d46919457e4db06ad5ac798ac3f6e9d730763f9601ca7a063cc645e449e5964d97cb24e89c8024a689da805e4f4c7d1a01cabc03c5f728372db3fad16134f2
+EBUILD keystone-15.0.0.ebuild 6152 BLAKE2B dc8cf65bf24f787e2bd6b7e382de13664d54b3557a356d989e80b49369219df8ef103c9a35a877efc2f2f6e790e4d1d56bd4d226a52cb86ea0af3d6137ee758a SHA512 080bc2fbb8711a9242bee0b080a0dca80591913aefd60d3b74bade94f332367e14ca1dd536fc0e01bc44f1aace547fb7fff29f3376f29b680305e5eeb8e46cce
 EBUILD keystone-2018.2.9999.ebuild 6750 BLAKE2B 6036789299ec6679527ed0a862310ea34d85540d09c82ac13b5deae92dd55654b669bf46f6cc80a0e88c2abb9137713704290063dc65759abbbea11d5e3c05bb SHA512 c7394c367e842abcef65887f9dc66701352c50dd330f4f0738bf70c35fb6414028369426cfa19dd08b1e520db3c722c918182f256b15398ba9601b32caff33f6
-EBUILD keystone-2019.1.9999.ebuild 6092 BLAKE2B 922a727dafdf3b93e7aaac12167d8ae04c8942ba1d91df93f51fc64b175f01966b8be0c3135c9ba83c905568620f86d00901ab3626ab7307a7980e61d5081fe8 SHA512 bd7d1f1d506d1ea2c7e324f9d52f5056925a5dc828226769b3b9048026a572db39a6e13efe22d21e47c6b0ffe40b871be4da0c7313bb4c50d111298025b5d4da
+EBUILD keystone-2019.1.9999.ebuild 6152 BLAKE2B dc8cf65bf24f787e2bd6b7e382de13664d54b3557a356d989e80b49369219df8ef103c9a35a877efc2f2f6e790e4d1d56bd4d226a52cb86ea0af3d6137ee758a SHA512 080bc2fbb8711a9242bee0b080a0dca80591913aefd60d3b74bade94f332367e14ca1dd536fc0e01bc44f1aace547fb7fff29f3376f29b680305e5eeb8e46cce
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-15.0.0.ebuild b/sys-auth/keystone/keystone-15.0.0.ebuild
new file mode 100644
index 000000000000..a553b77a52c0
--- /dev/null
+++ b/sys-auth/keystone/keystone-15.0.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/stein/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.38.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.43.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup keystone
+	enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+	# it's in git, but not in the tarball.....
+	sed -i '/^hacking/d' test-requirements.txt || die
+	mkdir -p ${PN}/tests/tmp/ || die
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -I 'test_keystoneclient*' \
+		-e test_static_translated_string_is_Message \
+		-e test_get_token_id_error_handling \
+		-e test_provider_token_expiration_validation \
+		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m0640 -okeystone -gkeystone
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}" keystone.policy.yaml.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+	doins etc/policy.v3cloudsample.json
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+	# stupid python doing stupid things
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-auth/keystone/keystone-2019.1.9999.ebuild b/sys-auth/keystone/keystone-2019.1.9999.ebuild
index f446425ea994..a553b77a52c0 100644
--- a/sys-auth/keystone/keystone-2019.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2019.1.9999.ebuild
@@ -144,6 +144,8 @@ python_install_all() {
 	doins httpd/*
 
 	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+	# stupid python doing stupid things
+	rm -r "${ED}"/usr/etc
 }
 
 pkg_postinst() {
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index a6b4a5c85d5a..0068a159fb03 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,7 +1,3 @@
-DIST pam_mount-2.14.tar.xz 312776 BLAKE2B 73010faf369c9627421a97019c5ae5e7db9cf1ab28c7d69eda48e9cfd4c0c5b1f3a001a44a9f2dc99dd016390f603908955877c9901df1390c5fef3e42441837 SHA512 621fc13f01c625bb0c8cb9ac1b7bcfd9851f239b37c4479eb9ff958ad2b7f00698df32e32893558119f486e2e5fa05514f6e8e34498359c432db75706cc2477e
-DIST pam_mount-2.15.tar.xz 312076 BLAKE2B aafc1c483b90bcb9a0a4d6040b02460dc07651973d09deddf74a88ea89dcd6f87b1f938732b0f80e76b75cf0e282e818dc24fd1b1bb0a33a5d2c44acebd92ecf SHA512 97252f3b65b1d1a42168b515c384a118e9f06fa68e2ceb9213cfc8ec4b967c52f2cb58742ebe117d7f5764551a371b7f71322a3de5f2912fc8722253081d77a4
 DIST pam_mount-2.16.tar.xz 312316 BLAKE2B 5954af8f8bf8b9cb47e1c07dc0d5fc5c4db099eeca5de90a3a53dc65aac0a2a6fba3f99c4d91d12f53b13abb5d3bae262b42536434553872a36ec108dc8d2c0c SHA512 3a579d7287cfcaef831d3e54d3e912407b65a966303e81c47f445d601f38f866ce04326e3d37a061f74f97b9cfb201e56109f57e55699d15d8f947ae2b91c8e3
-EBUILD pam_mount-2.14.ebuild 922 BLAKE2B 01085d12c54f1afc599476b6f6d211c5a5b55912181a7ac0f99ac5a89b5167db4f9d491ca5a7dc6c337eac6448f811dfcfa25e3558dec63a37416f28095b180e SHA512 0530001d56aeddd1d56afcc7da6e3d575d16f9c8b9d3383b10a16f73f16a2f391dce31f4633160c49b976a4f6c07a59781484c5575632b616d7df18abedbbc13
-EBUILD pam_mount-2.15.ebuild 903 BLAKE2B ca1ea381e39eb719d81a46621c0e044de02408905b19d4b2643534e357b4e787ee4e35c951c4eac8e17fd1b34466b2ca16acb66a036ff4e7f5c0dc54e318a99b SHA512 b8c5deb1f7f232c4b4d761a80e80da75d056dd99e07db804d54a1df3da645341eafd19d3ebe21d3f1978a359f543e9a4b40147cb7ecfa867a096710a272fc6fa
 EBUILD pam_mount-2.16.ebuild 898 BLAKE2B 35b563d37b700f117a3574df6bf81b3b80ce84d31e45fae748750c9723a9acf223aae9198a181ea495070bf011380374e09e76000ff2627f379bbf881530d121 SHA512 4cee527f52a845f669752c59a583ba88b0be841a98e939567c4be2691d4385caa1af57f026ddc8c1d8cfeea54e3f753e9f55d6e12169dab7eabf658738b0d476
 MISC metadata.xml 402 BLAKE2B 001c9702dee12640adcb05c6a6d9750e13ac0d45ebdb46859fc19e4071af76fcde847163f59b876992169968fefed8423352eec067ecf2ae6baa60dfdf412cc4 SHA512 546dd1bb071d1cc634250930b70328fc83f8bb4ac8a857fc3ccddadae5fcfb48d0a40adb0845e07535c63fd2dd2e6ef91779c0b48b6d147efa7aeb7fcde412e1
diff --git a/sys-auth/pam_mount/pam_mount-2.14.ebuild b/sys-auth/pam_mount/pam_mount-2.14.ebuild
deleted file mode 100644
index bef98ff742b8..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="crypt ssl selinux"
-
-COMMON_DEPEND=">=sys-libs/pam-0.99
-	>=sys-libs/libhx-3.12.1
-	>=dev-libs/libxml2-2.6
-	crypt? ( >=sys-fs/cryptsetup-1.1.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	default
-	use selinux || rm -r "${D}"/etc/selinux
-	dodoc doc/*.txt
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.15.ebuild b/sys-auth/pam_mount/pam_mount-2.15.ebuild
deleted file mode 100644
index d2d25b9e5962..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="crypt ssl selinux"
-
-COMMON_DEPEND=">=sys-libs/pam-0.99
-	>=sys-libs/libhx-3.12.1
-	>=dev-libs/libxml2-2.6
-	crypt? ( >=sys-fs/cryptsetup-1.1.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	default
-	use selinux || rm -r "${D}"/etc/selinux
-	dodoc doc/*.txt
-}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 652fe1443ffe..d64e7396eedf 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 390ea0797ac7..27515906f936 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -1,4 +1,3 @@
-AUX tgt-1.0.69-sysmacros.patch 1128 BLAKE2B d3e14b57ad16ccdc47def33de8da9c6dedb4f280919fc30fcd76a700a218c60843f8c0371bf728438ffc10d21eda5b1dd0af3a7a1bb5ce38a9676968022c6fe3 SHA512 37d74d52c2a29fbbdd482b7e583d9d6e1fa175f5824b32c635b49b46a05cbe7632bab06e6850c03e47789851b88a48f43078cfc29db8ee3f7beaad3ddb87d5b8
 AUX tgtd.confd 108 BLAKE2B 74e5f66f6fb193541853e562cd1de5e99806f1f324db6efb5f9a5217935044dd61237171b368dc1747017fbd9094d8c3acae4dfde0d5dfff69957c3f8800d63c SHA512 2153e99e3f6a2178bbbb2bda1d6af9a67d6080b36e7c5cbb4f951b10324c80a24fa224a7003c26b3b51d40a77bba97856bc009bbb0e664e93625face723edc91
 AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4fcc53c46e4678acf049c16ee761f29eb8e928f0713f38a9f73bd13db1e0408da56f42f64b337 SHA512 1e6d114dbb89c7a26e65546b6c775bcabc3c9508e0757e118a4272fbf4299a185b4679bc510d9cc3da7db25b96343ddc8e45de044543ebe26d952132eba4de30
 DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77ddc3b44758134199efa5b55dafd09cd2ac3f1b12abc3a77077dffdcab1e9b2aa0a97fcd2e2c19ba24a5cd9cf SHA512 aa905b44a3495275549d4abe8542e2b6b086bbab79b83d2902cba1e6124889a8873d479d1111128416b23c7681433fbe37c1772e8578bb12bf80b96267f65c0a
diff --git a/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch b/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch
deleted file mode 100644
index 0b28f02e2821..000000000000
--- a/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/580594
-https://github.com/fujita/tgt/pull/25
-
-From b092c6fe330a2eacf4b1d4eb093fad8e2fbcaed9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 27 Nov 2016 18:47:24 -0500
-Subject: [PATCH] fix build w/newer glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building with newer glibc versions fails like so:
-bs_sg.c: In function ‘chk_sg_device’:
-bs_sg.c:354:6: error: implicit declaration of function ‘major’ [-Werror=implicit-function-declaration]
-  if (major(st.st_rdev) == SCSI_GENERIC_MAJOR)
-
-This is because glibc is dropping the implicit sys/sysmacros.h include
-from sys/types.h and making the few projects that need it include it
-explicitly.
----
- usr/bs_sg.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr/bs_sg.c b/usr/bs_sg.c
-index 66f4a3b22a18..fb544056f258 100644
---- a/usr/bs_sg.c
-+++ b/usr/bs_sg.c
-@@ -32,6 +32,7 @@
- #include <linux/fs.h>
- #include <linux/major.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/epoll.h>
--- 
-2.11.0.rc2
-
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index c5a5989a35cb..4af7fea40e62 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 6314fab566f7..7be4cea6d14b 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,10 +2,15 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-13.0.3.tar.gz 5464871 BLAKE2B 3d2beebe7503d673ebc8a3f6b07da2a6799d276578823cb1abb518894f88cf97ec051337016b177ddc45614d70b9a5350a49c144011b0d1e41beaf901b4a73da SHA512 2e358f7f0220aa6b6b88dedc8c942abcf5c54c53a690d18d84bee6d63b4f28b75c463f1d37a5e24925431e441f26066dbb0b4d33750429efbe7663d0e69de3a4
 DIST cinder-13.0.4.tar.gz 5466572 BLAKE2B de5511f74faa9a096fa1183a78e65b0950fa95cc9e746ac750ecfd6ce840bda7f4f9899b2af4bcacb4cef6e8f5bb94bf706263df5055ed973ecc43ea1834ef68 SHA512 a492580718cb2cdd47bf1dc74d95ef9b3a6afdf50351e20e840c6a9805aed434e520be30c4126ba26216011b16e16007bc6e8816bb8aa7aea1e20d7cc2d622dd
+DIST cinder-14.0.0.tar.gz 5498509 BLAKE2B adbd31dc953b467690a82be29e75467ec60a65064e402c1659948cb413154e9e9efd088ecc3b7accbe9b378e3a7f8bd5325d133e2d37b38d9ce091189857e293 SHA512 28940052eea307bcdce8ed9f7df09cb58b7250e561e128b3dd65123f8baffdacfadb6f6243a82d898fb8dc4ce11cf0fb0ad9905d5445cf61e2f603a580915562
 DIST cinder.conf.sample-13.0.3 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-13.0.4 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-14.0.0 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-2019.1.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 EBUILD cinder-13.0.3.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
 EBUILD cinder-13.0.4.ebuild 7811 BLAKE2B f903b27a6a07b69413fadabd0e94a368b4553438fe89404b9fdceefe4f77a80924bbabc84460393c6437583c34e6fb9d108d222e1e84a387c8864f7fe731390a SHA512 8ace1323dad4c04e7ef36042104552c870f560ab376b4b192a28923dafad60915ea9f0631fe239ec47a8ffa65b1d15daf66f4ad7a19b44497e234a7b953b27b4
+EBUILD cinder-14.0.0.ebuild 7820 BLAKE2B a74c6803f6c89c2e658e8d2eb953e34f1810deb73b5efc6ccafe4151d51803f53a9eea69aceae26f7e03b47986a9353cee19e1327dde29235925fc3a656ed1e7 SHA512 34b0c461b2ea331bdfa2df35d4fe1ca73951b51c6c31e0191ae430b19f973c046a4aad4f63a5c10442f1d96ac1fa2a468c170867d637a143663be029192a28d9
 EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
+EBUILD cinder-2019.1.9999.ebuild 7820 BLAKE2B a74c6803f6c89c2e658e8d2eb953e34f1810deb73b5efc6ccafe4151d51803f53a9eea69aceae26f7e03b47986a9353cee19e1327dde29235925fc3a656ed1e7 SHA512 34b0c461b2ea331bdfa2df35d4fe1ca73951b51c6c31e0191ae430b19f973c046a4aad4f63a5c10442f1d96ac1fa2a468c170867d637a143663be029192a28d9
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-14.0.0.ebuild b/sys-cluster/cinder/cinder-14.0.0.ebuild
new file mode 100644
index 000000000000..164354dab032
--- /dev/null
+++ b/sys-cluster/cinder/cinder-14.0.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/cinder/cinder-2019.1.9999.ebuild b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
new file mode 100644
index 000000000000..164354dab032
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index d3728615f93a..8f72193360bc 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -2,8 +2,10 @@ AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84
 DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
 EBUILD kubeadm-1.13.4.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.13.5.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.14.0-r1.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.14.0.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
+EBUILD kubeadm-1.14.1.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.1.ebuild
new file mode 100644
index 000000000000..763c3838067b
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.14.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
+	popd || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 5a6020f7df11..82dda21c818f 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -10,6 +10,7 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54e0258e7efb1578be727d5019c1f44638358462acccafa91bed2320d6392c54416079bb54bed12977739092965aeaeb5 SHA512 aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubelet-1.10.12.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.11.6.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
@@ -18,5 +19,6 @@ EBUILD kubelet-1.13.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fd
 EBUILD kubelet-1.13.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.13.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.14.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.14.1.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.9.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.14.1.ebuild b/sys-cluster/kubelet/kubelet-1.14.1.ebuild
new file mode 100644
index 000000000000..f38ce59e625d
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot systemd
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	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-devel/Manifest.gz b/sys-devel/Manifest.gz
index 236ebb375e5f..67de87759382 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 26acd062d03b..27e92ec760ed 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -17,15 +17,15 @@ DIST binutils-2.31.1-patches-6.tar.xz 76196 BLAKE2B e3c8de07dad62bb3093846389bc1
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-1.tar.xz 93252 BLAKE2B 80d229be60c3377fe52ff3e74ee911b5dcfb9456d3f42a57662fbda3184ac1c63e698e592f804ac05c459527d0cd4bae7d8c9ef8caef02fdf4f17aa783f4ff81 SHA512 69999f60d89589dcf9e3cb18e50f153ab4ce05bdf3f3758fa322b5c4cb468aeda46c416da540995ddff1ea5e96354c264fa5ff0156c53685816d35117eb481e0
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
-DIST binutils-9999-patches-3.tar.xz 17516 BLAKE2B 6b75a11f2e1d938d5579b52d97dc1d33659c4b5496c76a4aae1a48088fa8edd7339fb65c98ee9e7eb6d389d18b240c596139648329c2724c575440c97f5c8918 SHA512 b4c412c0a973dc7b794a6ab29da1d55a94d40b96c54982ebcb831661be0512e5cd6b11f26998d63193cedb77f554968e63398a6e74ffbaa57d65e3415ca1ac44
+DIST binutils-9999-patches-4.tar.xz 17480 BLAKE2B 8e85fb15c740e19bb27482bea134342970fe1af8c39639a16a087c1e3b7386e469d9db6b0d1c0e1e62d550c145814e3013ef65708e91313b648a94ac5c4cafed SHA512 6d09513da6995b83c24afd0799f918281198c412cb65f04e07002fed1b036fb1c6cb075be499a2415e8b286f288b80c02fae1b1dfcd288fe216254d31206b6e3
 EBUILD binutils-2.25.1-r1.ebuild 280 BLAKE2B 6c3abc3c6b80becab91ec1f2c88c1f5dba11e862035355a9ce2c029b865865ca58c359f25496c50aa63cadb3ca08de77eb2a86c2d2286441870f65a7a943b42a SHA512 4cc55460454f6ae62fb900bdbce4896279dd27dfc5b09126d8942675970776cafccdd6d7adfdfba74862ee2e84ad7d2be9b7ddc79319a6dfc09b745e16b18a54
 EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B a30f16d4bd14247b3528ec6647190e066a01cd1b5b11f8eb14f132b73bb520c38acfbe648d683c64b50feb46dd70f6ca8835ac4405100ceefc918552e80a0239 SHA512 208574e5c850d00402d6630d7ef30b9216fdabec8aa0287f3f379b3c9d4d1315c8b4b0e55016807906c1bb01c3fb6941712606004ad627c78a950b632a45f2ec
-EBUILD binutils-2.31.1-r4.ebuild 12424 BLAKE2B 934566f952048063989e0910942e01b20acabcf0fef4ad35141168053f7644295121e0b92100a2b2aaddcfcb44d29424b73a7ee6587afc6ea5f632bd10c575ed SHA512 b0248193f5064fea6345edfd6fc524d2f8063b8edc2123e029736cf470d547e649a4871d37097b39ee266d4e9d1567c46c13db0a64a16f010eac33ff197fa88c
+EBUILD binutils-2.31.1-r4.ebuild 12423 BLAKE2B d36fd4468003137eb3d8345f6b7089789d6ac46c1d3068e88c73852047907df4188f38d6bb565c50dafff4578bb1a4874ec1a74ab2e48a826251fcd84829565a SHA512 36ced4129562b3050322bc2e8fee77c0eadfefad68ac413cc7ef97e89d4f74db28c9a3739aeea3f13eb84a7914b7262fc5b8935c57380015f4e7c717451856a8
 EBUILD binutils-2.31.1-r5.ebuild 12430 BLAKE2B 4b9dc2a7877c2c0c8aadb404049ec0fdaf18339715f834aa133f6e87f6dc137849c5b4a363a096f328ba91dfc4941bcc9792a3332394cdc1061dfd2e09df8ff7 SHA512 4b9b477df5239637b9b8b6cb3f7589b94a65d8ad9ed4a4151cbbdd47f29d1c9f6b568bb789b53fd37632d388c1eca20ba8d8c38a3fed66a58e13746b9028fa88
 EBUILD binutils-2.32.ebuild 12521 BLAKE2B cc7fe92df094d3f039c48b62770a66996e09f1497514d04ce967cc195d62cebd0ad51ed8de5b513ae2ef868e45546d06c3d1a165855f707528a1792a0e2429a0 SHA512 b4a327df71effe3212598d60ed94afb0752835df25e23f9edcf8df1f458cb8b7ee0ec768d865865f9b6e5314b7497be9aef5ae0e483fc55cd07e8231dd79bfdd
-EBUILD binutils-9999.ebuild 12242 BLAKE2B d3241f06eeea30cb33762b1e3f08b6c435e84cde0a56a0d72cbb17ec8eae37c51517bfae2b4a32049972bde2116d2134e91648118fdd914607e225643d57b2e7 SHA512 4b93f878e08809c339ef9bf32fd02a9fa8b44ae77409be6610cd1e59a0191212e73d544fb48a52a18ec4e9c5d5a030024c11d75c2123e0d166b417284266dbee
+EBUILD binutils-9999.ebuild 12242 BLAKE2B 1a3e243ad0cbbc696117e1fee0ffb47c87260433391f0a0c8f51cec2886253c5a0340aa33b0a88412ccbb52b0433f712d0abe7230d9c85e19e362088fad2a4bf SHA512 488f1fe7cdfa1f88de45a88b9b5a8ef06ce7436a32f2c33d4688bacc086c5766bc03b310989db8fdc49a203586ad8766e28817443767284f2a40d35a9918c57f
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.31.1-r4.ebuild b/sys-devel/binutils/binutils-2.31.1-r4.ebuild
index 8fbb9673ded0..2f9f4183e3ac 100644
--- a/sys-devel/binutils/binutils-2.31.1-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r4.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index a4877ac83781..80a41f81b29a 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )"
 # PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
 #                      for the patchsets
 
-PATCH_VER=3
+PATCH_VER=4
 PATCH_BINUTILS_VER=9999
 
 case ${PV} in
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index f7fc08820f22..9eda70462443 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -18,10 +18,6 @@ AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
-DIST distcc-3.3.tar.gz 1171281 BLAKE2B f637cacbfdaaca6efb56e912de55fcfa49e3fffcb8f34649e339f16376250e18a20d30281a46f207992c0b300c726427a3ad5a77bd8976d2993f8f49b9b6b970 SHA512 459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc
 EBUILD distcc-3.2_rc1-r4.ebuild 5603 BLAKE2B 92accfb9fbdec29da8376407a7ee9e67f387bbdf1c5f3da22707917c1f600b64613225536064518aeef0c65d82f7a29f1f8b26c7c47b1306aa80c395bbde5313 SHA512 1f2766a19aaf84f4c7d37fca9f85b2badda7fa0fac6e8f7d2c819b303f4edf6b399e89a93abeca868ea28511b2985791ec91c32db89cb05d04b1a2ce984e669b
-EBUILD distcc-3.2_rc1-r5.ebuild 5365 BLAKE2B 7024c98de89530de80be0fc6538a7b59c127d337c26895576bce24e42ba349b8440de11f9fcc5ff357b955ca29856fb94b13db8440a5c15fe0aa248bd359b6f0 SHA512 489927c0eb49862dba56fad165a7940485184664a492a26ae34c830a561ee582778a6be0c5d5e41d98985f67b2330c182c3103fc2d75998261b5c8f8cc4bb867
-EBUILD distcc-3.3.2-r4.ebuild 5683 BLAKE2B e6b0b4b4944d0a968d39a80aef5bc57e747f0c773cc3439ed1a2ac719277e707f034abeb4310f826bfbe1d030b3e0204f18541f746aaf6765b4bfa88d4143614 SHA512 e7002f599531422a9e772f400841f45611b8d52813fa3a29fce7aafae5194649887a293843bfeb24e228c5eb9cfaaf233247476268276a727b0249c6b6888e30
 EBUILD distcc-3.3.2-r5.ebuild 5700 BLAKE2B 096c1cf554a1caa3762726b8b93f8414ce3f8e1ebcbb1da87f199d5a1be69cda4bcc41b4de2008945d1ea4d202ae35789d416c5b671a817346750d3f753636ba SHA512 347823e4ddb36ac625a5305a022b947f397475e2d36011cf30a8b6e82389f7834762fb7a0f19779e0370c21e0b93f63f04aac0761370e5f239a0b71464be4d7f
-EBUILD distcc-3.3.ebuild 5528 BLAKE2B 26d30e922367811a40608dd5899db748c82dc812e573bf56c309ae2853829dccee30f5b7028ad4190a8c32c03c65345b7f29349a614dd258848d4cf5235d686d SHA512 34ad7a871d175fb10aea3fa2b5da9d6ed32a2e6d4d015e3ad9228308c5b51453648748cfe1e865d7a0d07820204a823c3c3fa7953adc8ea3d8e62881eb580c51
 MISC metadata.xml 686 BLAKE2B 149386337b838821ca538556fa2548b759ed09a5a99ff2de536390ba0a39f30c72722e88e0e413122df2d893a317a25eed5e43046a0721b960e0c0b5bfbd8c8e SHA512 22eacde5aeb935c963a80bf5d3a39e4db08ad2613232aabba2a109748b29169ffca04cf53f946a6110d3cf66358ec53e4a025cbbe12a84597ea3130475e9343d
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
deleted file mode 100644
index b4598fc9c5b8..000000000000
--- a/sys-devel/distcc/distcc-3.2_rc1-r5.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 systemd toolchain-funcs user xdg-utils
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	gssapi? ( net-libs/libgssglue )
-	gtk? ( x11-libs/gtk+:2 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	dev-util/shadowman
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_pkg_setup
-
-	DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-	DISTCC_VERBOSE="0"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
-	# bug #253786
-	eapply "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
-	# bug #255188
-	eapply "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
-	# bug #258364
-	eapply "${FILESDIR}/${PN}-3.2_rc1-python.patch"
-	# for net-libs/libgssglue
-	eapply "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
-	# SOCKSv5 support needed for Portage, bug #537616
-	eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	eapply_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/$(get_libdir):" \
-		"${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
-
-	eaclocal -Im4 --output=aclocal.m4
-	eautoconf
-}
-
-src_configure() {
-	local myconf="--disable-Werror --with-docdir=\$(datadir)/doc/${PF}"
-
-	# --disable-rfc2553 b0rked, bug #254176
-	use ipv6 && myconf="${myconf} --enable-rfc2553"
-
-	econf \
-		$(use_with gtk) \
-		$(use_with gnome) \
-		$(use_with gssapi auth) \
-		$(use_with zeroconf avahi) \
-		${myconf}
-}
-
-src_install() {
-	default
-	python_optimize
-
-	newinitd "${FILESDIR}/3.2/init" distccd
-	systemd_dounit "${FILESDIR}/distccd.service"
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
-	if use zeroconf; then
-		cat >> "${T}/distccd" <<-EOF || die
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
-	fi
-	doconfd "${T}/distccd" || die
-
-	cat > "${T}/02distcc" <<-EOF || die
-	# This file is managed by distcc-config; use it to change these settings.
-	# DISTCC_LOG and DISTCC_DIR should not be set.
-	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
-	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
-	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
-	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
-	DISTCC_SSH="${DISTCC_SSH}"
-	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
-	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
-	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
-	EOF
-	doenvd "${T}/02distcc" || die
-
-	keepdir "${DCCC_PATH}" || die
-
-	dobin "${T}/distcc-config" || die
-
-	if use gnome || use gtk; then
-		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
-		einfo "This is to have a little sensability in naming schemes between distccmon programs"
-		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome || die
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d || die
-		newins "doc/example/xinetd" distcc || die
-	fi
-
-	insinto /usr/share/shadowman/tools
-	newins - distcc <<<"${EPREFIX}${DCCC_PATH}"
-
-	rm -r "${ED}/etc/default" || die
-	rm "${ED}/etc/distcc/clients.allow" || die
-	rm "${ED}/etc/distcc/commands.allow.sh" || die
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update distcc
-	fi
-
-	use gnome && xdg_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://wiki.gentoo.org/wiki/Distcc"
-	elog
-	elog "distcc-pump is known to cause breakage with multiple packages."
-	elog "Do NOT enable it globally."
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
-	fi
-
-	elog
-	elog "***SECURITY NOTICE***"
-	elog "If you are upgrading distcc please make sure to run etc-update to"
-	elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
-	elog "added security precautions (the --listen and --allow directives)"
-	elog
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
-		eselect compiler-shadow remove distcc
-	fi
-}
-
-pkg_postrm() {
-	use gnome && xdg_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
deleted file mode 100644
index 9c94466284f4..000000000000
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit autotools flag-o-matic python-single-r1 systemd \
-	toolchain-funcs user xdg-utils prefix
-
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86"
-IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	gssapi? ( net-libs/libgssglue )
-	gtk? ( x11-libs/gtk+:2 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${CDEPEND}
-	sys-devel/autoconf-archive
-	sys-libs/binutils-libs
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	dev-util/shadowman
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/distcc"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
-	# bug #255188
-	eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
-	# SOCKSv5 support needed for Portage, bug #537616
-	eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	# crash on missing directory
-	eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.patch
-	eapply_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/lib:" \
-		"${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
-
-	hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
-	python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--libdir=/usr/lib
-		$(use_enable ipv6 rfc2553)
-		$(use_with gtk)
-		$(use_with gnome)
-		$(use_with gssapi auth)
-		$(use_with zeroconf avahi)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# override GZIP_BIN to stop it from compressing manpages
-	emake DESTDIR="${D}" GZIP_BIN=false install
-	python_optimize
-
-	newinitd "${FILESDIR}/distccd.initd" distccd
-	systemd_dounit "${FILESDIR}/distccd.service"
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
-	if use zeroconf; then
-		cat >> "${T}/distccd" <<-EOF || die
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
-	fi
-	doconfd "${T}/distccd"
-
-	newenvd - 02distcc <<-EOF || die
-	# This file is managed by distcc-config; use it to change these settings.
-	# DISTCC_LOG and DISTCC_DIR should not be set.
-	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
-	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
-	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
-	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
-	DISTCC_SSH="${DISTCC_SSH}"
-	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
-	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
-	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
-	EOF
-
-	keepdir /usr/lib/distcc
-
-	dobin "${T}/distcc-config"
-
-	if use gnome || use gtk; then
-		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
-		einfo "This is to have a little sensability in naming schemes between distccmon programs"
-		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "doc/example/xinetd" distcc
-	fi
-
-	insinto /usr/share/shadowman/tools
-	newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
-	newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
-
-	rm -r "${ED}/etc/default" || die
-	rm "${ED}/etc/distcc/clients.allow" || die
-	rm "${ED}/etc/distcc/commands.allow.sh" || die
-}
-
-pkg_postinst() {
-	# remove the old paths when switching from libXX to lib
-	if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
-			-d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then
-		rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die
-	fi
-
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update distcc
-		eselect compiler-shadow update distccd
-	fi
-
-	use gnome && xdg_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://wiki.gentoo.org/wiki/Distcc"
-	elog
-	elog "distcc-pump is known to cause breakage with multiple packages."
-	elog "Do NOT enable it globally."
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
-	fi
-
-	elog
-	elog "***SECURITY NOTICE***"
-	elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist"
-	elog "has been generated by compiler-shadow distccd.  To revert to the old behavior, "
-	elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd."
-	elog "Cf. https://github.com/distcc/distcc/pull/243."
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
-		eselect compiler-shadow remove distcc
-	fi
-}
-
-pkg_postrm() {
-	use gnome && xdg_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.3.ebuild b/sys-devel/distcc/distcc-3.3.ebuild
deleted file mode 100644
index 995a109a07be..000000000000
--- a/sys-devel/distcc/distcc-3.3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit flag-o-matic python-single-r1 systemd toolchain-funcs user xdg-utils prefix
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	gssapi? ( net-libs/libgssglue )
-	gtk? ( x11-libs/gtk+:2 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${CDEPEND}
-	sys-libs/binutils-libs
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	dev-util/shadowman
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
-	# bug #255188
-	eapply "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
-	# SOCKSv5 support needed for Portage, bug #537616
-	eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	eapply_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/lib:" \
-		"${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
-
-	hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		$(use_with gtk)
-		$(use_with gnome)
-		$(use_with gssapi auth)
-		$(use_with zeroconf avahi)
-	)
-
-	# --disable-rfc2553 b0rked, bug #254176
-	use ipv6 && myconf+=(--enable-rfc2553)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# override GZIP_BIN to stop it from compressing manpages
-	emake DESTDIR="${D}" GZIP_BIN=false install
-	python_optimize
-
-	newinitd "${FILESDIR}/3.2/init" distccd
-	systemd_dounit "${FILESDIR}/distccd.service"
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
-	if use zeroconf; then
-		cat >> "${T}/distccd" <<-EOF || die
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
-	fi
-	doconfd "${T}/distccd"
-
-	newenvd - 02distcc <<-EOF || die
-	# This file is managed by distcc-config; use it to change these settings.
-	# DISTCC_LOG and DISTCC_DIR should not be set.
-	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
-	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
-	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
-	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
-	DISTCC_SSH="${DISTCC_SSH}"
-	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
-	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
-	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
-	EOF
-
-	keepdir /usr/lib/distcc
-
-	dobin "${T}/distcc-config"
-
-	if use gnome || use gtk; then
-		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
-		einfo "This is to have a little sensability in naming schemes between distccmon programs"
-		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "doc/example/xinetd" distcc
-	fi
-
-	insinto /usr/share/shadowman/tools
-	newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
-	newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
-
-	rm -r "${ED}/etc/default" || die
-	rm "${ED}/etc/distcc/clients.allow" || die
-	rm "${ED}/etc/distcc/commands.allow.sh" || die
-}
-
-pkg_postinst() {
-	# remove the old paths when switching from libXX to lib
-	if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
-			-d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then
-		rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die
-	fi
-
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update distcc
-		eselect compiler-shadow update distccd
-	fi
-
-	use gnome && xdg_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://wiki.gentoo.org/wiki/Distcc"
-	elog
-	elog "distcc-pump is known to cause breakage with multiple packages."
-	elog "Do NOT enable it globally."
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
-	fi
-
-	elog
-	elog "***SECURITY NOTICE***"
-	elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist"
-	elog "has been generated by compiler-shadow distccd.  To revert to the old behavior, "
-	elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd."
-	elog "Cf. https://github.com/distcc/distcc/pull/243."
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
-		eselect compiler-shadow remove distcc
-	fi
-}
-
-pkg_postrm() {
-	use gnome && xdg_desktop_database_update
-}
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 2f83d39fd79e..4f9d2b4dfd88 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -5,6 +5,5 @@ AUX patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch 860 B
 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382
 AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
-EBUILD patch-2.7.6-r2.ebuild 1064 BLAKE2B 75ecf02fb251c8e1947458e1b1f437a2a07d554be979bb97a587e75e8daba71cdd2781cfd596aa40d969450f8039b4c537fc71af2cf5bca866be8136aa576b77 SHA512 5cc7ee806c59197c0c86b7414232c731f7927d43ad995845daee701c629ce56aaf4f514bd7c60c0dd53f3573736e99e7ee37cb9c7dd49add60835e0526ac90e3
-EBUILD patch-2.7.6-r3.ebuild 1294 BLAKE2B 10a755aba11e37f3a2458906705db3447c2c93884d8680e72cee66b90ff535241b801c1b64affdf87d7f2c6cf56741c9561032e9c31f88cc6ba8f975cdc0ba98 SHA512 279891cb51a9ce02ccb32f89be9f89356ff08721dcb8a1ed4d5a523e71e36a220da5584955b50e5f799358397b19e6ec0760355980c6052bc37392dd71250ec5
+EBUILD patch-2.7.6-r3.ebuild 1291 BLAKE2B 0504c3946b6a93d896be7bbf219a7fca120041730d45dea8ce305b61ba18f4b68a99b6ea762f9d5c1df31a49708db8ecb17074e5f3a8ca0318f9014826252e6c SHA512 46c368f6288556b709efa29afbf135fa1cdb03c86c499734fd929bd1f99c870dabae45900f1309c45a4e4b6eea12c7eacc1c52dce55b59adf98ad45535dfd772
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.6-r2.ebuild b/sys-devel/patch/patch-2.7.6-r2.ebuild
deleted file mode 100644
index a50f746ea057..000000000000
--- a/sys-devel/patch/patch-2.7.6-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static test xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/ed )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-test-suite.patch
-	"${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable xattr)
-		--program-prefix="$(use userland_BSD && echo g)"
-	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild
index e34544416472..079eb98f174d 100644
--- a/sys-devel/patch/patch-2.7.6-r3.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 00b860da3a18..93074fecbb59 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 61ad01edec3c..3187eed914d5 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -7,12 +7,14 @@ AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88c
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
 DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
+DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8
 EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
+EBUILD squashfs-tools-4.3_p12.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
 EBUILD squashfs-tools-4.3_p7.ebuild 2083 BLAKE2B e94eb44a37068afd2d4feb85f1d9c03dcfab2dba5c4db87a310885b5934a3c8f167533f540a6c8100cdf5602ab46d45c85fe2570ceaa9f51abf78a329ba80f7b SHA512 a002e24d8a63b0db59565600407f67a265ccdbcb7ac930da4711e1b9e72df98d3d13da82ed321a88064f8e78c8de85cbeab87e52a80e91948ed54bdc8681ab68
 EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
new file mode 100644
index 000000000000..48c56a335453
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 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="http://squashfs.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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}"/${P/_p*}-sysmacros.patch
+	"${FILESDIR}"/${P/_p*}-aligned-data.patch
+	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
+	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
+	"${FILESDIR}"/${P/_p*}-extmatch.patch
+	"${FILESDIR}"/${P/_p*}-musl.patch
+)
+
+S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
+
+src_prepare() {
+	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
+	eapply -p2 ${PATCHES[@]}
+	eapply_user
+}
+
+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[@]}"
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd ..
+	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
+	doman "${WORKDIR}"/debian/manpages/*.[0-9]
+}
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index b096e080667d..7511a74e9173 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,3 @@
-DIST vhba-module-20170610.tar.bz2 15622 BLAKE2B 7556f13dba719779a8c9c2acb03c51f9f4b33153b46146109cd3387094a9e3ca2ad9750e4564139696c2a417a5aad347c32a33eeb7b69594477efc2ceab0e12e SHA512 bf27a6a7a6aabf6c1a4c1f16b1a08dce460ee675ea53b141c6db8edf0637dffa900e03b9141f9f1a672fcd8f84e6f2be86a07e1f78bc5667a7a7669d45f1f687
 DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38
-EBUILD vhba-20170610.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
 EBUILD vhba-20190302.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20170610.ebuild b/sys-fs/vhba/vhba-20170610.ebuild
deleted file mode 100644
index 157ae2ff9f9d..000000000000
--- a/sys-fs/vhba/vhba-20170610.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils linux-mod udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=modules
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
-	check_extra_config
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Avoid "make jobserver unavailable" warning and -Werror problems
-	sed -e '/ccflags/s/-Werror$/-Wall/' \
-		-i Makefile || die "sed failed"
-
-	eapply_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	dodir "$(get_udevdir)"/rules.d
-	cat > "${D}/$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
-	# do not edit this file, it will be overwritten on update
-	#
-	KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
-	EOF
-}
-
-pkg_postinst() {
-	# Older versions of vhba installed their rule file in /etc/udev/rules.d,
-	# which overrides rules in /lib/udev/rules.d. We remove the old file
-	# automatically if it is identical to the default one installed by
-	# vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules
-	# file states that it can be automatically overwritten by the system.
-	old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* )
-		  	elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" ||
-				eerror "Failed, please remove ${old_rules} manually."
-			;;
-		  * )
-			ewarn
-			ewarn "The ${old_rules} file from a previous"
-			ewarn "installation of ${PN} is overriding ${P}'s"
-			ewarn "udev rules. Unless you had deliberately customized it,"
-			ewarn "you should remove it."
-			ewarn
-			;;
-		esac
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 609e5364e8dd..6d50df26ffbc 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 572cf1c7a0ba..a6a45284f713 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,6 @@
 DIST linux-firmware-20190313.tar.gz 177810569 BLAKE2B 410206491591115505964ca1cefb5effe6bb43002234489285a0985c7a87f80071ed22dd5678f5457ec6611bdd702ac9610ba89b3e44174f8d222b75b5d32d2a SHA512 eec933ebdefe83d466bfcf0babe710f95f67d319317f3187e43518a15a273b47e63ae88a35106932f0a8d5ce54f8a4c5325d7ab9da8b1789eed532a4a500fafd
+DIST linux-firmware-20190409.tar.gz 183446874 BLAKE2B 2c6ee33a390efd43470cb0f67d289fc1c863f7c5358b4597e1cc7f4b7aa72933332a867a98899f66f9c8df3d9495f96ae583fa9bdb4004f6f2e7ab47380a50d0 SHA512 2a48b210e4101f3aad595612d20f23b4b98b3eb20871712ee17841fd2212d292c25b6c94ac12c71cac82e23c75840b3488c8ada8161a18bce33d328baa002581
 EBUILD linux-firmware-20190313.ebuild 3685 BLAKE2B 2630a8397dc4a294381d76181c5bb4b73e0a6c7a994dff7af644de2080ff4d3cc41dc6437940ef83372e9ff21761b14a0124f941564a9c41303694c4506911cc SHA512 c13931024b2e044f531878918f71fd8203ba13e0e1f8e29e20d804ce20d756e7fe751b6589ea87a8b9655e9a9f15eca957c03633d5962aa4fe4fec603eb8860f
+EBUILD linux-firmware-20190409.ebuild 3698 BLAKE2B 3c890937535fde0ee95a0e13a06ae424daa2a7f88701729097fee8c443962c348d6c47cd3061a54fec5e2528ff78b85863543d693027ab4f033843999cfd233f SHA512 10042179d70d245d6aeb717c6eaa4298a8b0accd221bf0d54da19983616ebe8c997744b9568e8199a1329e969fe09d7c391b75218fd74036427f4ee2fcdce556
 EBUILD linux-firmware-99999999.ebuild 3658 BLAKE2B fd08ee9d29ff91a161693cdfd6b493bf8c898d4596e19ce5633b60f5bf06a07ba6217587f5737edcee36e0bb03cde69dd3a68d6083b0f63cdf3e177dad2367d3 SHA512 64c453294857b99cf7373cb1fe5e8451efbc0ba62d1660dbe49d91670270468a468dfadbcedd3cc03df5ea8d25eed3235f7b82fa21a36f7234fbb2d6e3d1ce9f
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild
new file mode 100644
index 000000000000..0bdd581f790e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20190409.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	GIT_COMMIT="260cb35b11a968e7896f911565b75e411636ad69"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+"
+SLOT="0"
+IUSE="savedconfig"
+
+DEPEND=""
+RDEPEND="!savedconfig? (
+		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+		!sys-firmware/alsa-firmware[alsa_cards_sb16]
+		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		!media-tv/cx18-firmware
+		!<sys-firmware/ivtv-firmware-20080701-r1
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+		!net-dialup/ueagle-atm
+		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
+		!net-wireless/i2400m-fw
+		!net-wireless/libertas-firmware
+		!sys-firmware/rt61-firmware
+		!net-wireless/rt73-firmware
+		!net-wireless/rt2860-firmware
+		!net-wireless/rt2870-firmware
+		!sys-block/qla-fc-firmware
+		!sys-firmware/amd-ucode
+		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
+		!sys-firmware/iwl2030-ucode
+		!sys-firmware/iwl3945-ucode
+		!sys-firmware/iwl4965-ucode
+		!sys-firmware/iwl5000-ucode
+		!sys-firmware/iwl5150-ucode
+		!sys-firmware/iwl6000-ucode
+		!sys-firmware/iwl6005-ucode
+		!sys-firmware/iwl6030-ucode
+		!sys-firmware/iwl6050-ucode
+		!sys-firmware/iwl3160-ucode
+		!sys-firmware/iwl7260-ucode
+		!sys-firmware/iwl7265-ucode
+		!sys-firmware/iwl3160-7260-bt-ucode
+		!sys-firmware/radeon-ucode
+	)"
+#add anything else that collides to this
+
+RESTRICT="binchecks strip"
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+		ebegin "Removing all files not listed in config"
+
+		local file delete_file preserved_file preserved_files=()
+
+		while IFS= read -r file; do
+			# Ignore comments.
+			if [[ ${file} != "#"* ]]; then
+				preserved_files+=("${file}")
+			fi
+		done < ${PN}.conf || die
+
+		while IFS= read -d "" -r file; do
+			delete_file=true
+			for preserved_file in "${preserved_files[@]}"; do
+				if [[ "${file}" == "${preserved_file}" ]]; then
+					delete_file=false
+				fi
+			done
+
+			if ${delete_file}; then
+				rm "${file}" || die
+			fi
+		done < <(find * \( \! -type d -and \! -name ${PN}.conf \) -print0 || die)
+
+		eend || die
+
+		# remove empty directories, bug #396073
+		find -type d -empty -delete || die
+	fi
+}
+
+src_install() {
+	if use !savedconfig; then
+		save_config ${PN}.conf
+	fi
+	rm ${PN}.conf || die
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1092997b7b58..e7a7f157dc34 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index ef9b23f1f671..840a52220ce5 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -18,7 +18,7 @@ EBUILD binutils-libs-2.27.ebuild 2847 BLAKE2B 3d02dfccc46d3398646d338e01f096de36
 EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a1775ca47030bd26cf2cf4ce4f6b7f3c5325d1629b3713aa40a1f85b9b0151555cf0a978c0390bef48846b3b1eb0c89b05d SHA512 b00d0080957824bf447035172b4941fecfd358f2cbbdeb82a578e11e0a8b4c712091344b904d8f74840164032d210834b30ed8a90ac3dddb47dc9632d66f8a9b
 EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
 EBUILD binutils-libs-2.30-r4.ebuild 3594 BLAKE2B 60b602ed843164cceee4c490fba486e38b4fe8272ec94dafc652aa891a2a148f4e8f69d88c9fb6ca6fa154cd1365bf1473ea73ce2f9bab4d1a36d08259eb7f89 SHA512 fed6718f162b379e381900b1b4c7fcfa3bfe0710f8d489e3ba19ff1d3accb51dfde7d44df5c608d8c9cf6f5d5cc92e7e518b7719ccb832b89d285507507022ee
-EBUILD binutils-libs-2.31.1-r4.ebuild 3579 BLAKE2B 292bcc6b6837f15bb43a963d1942b0af78e57e5778274597be1ea2b067fabac1ab990cc79c8904af974ecd2343a2326be0b743c19d7854564d88f8ea001d5f84 SHA512 d4875f1920e84fa513b2da4727e02fe98bac571550de2d16ef6f49d681492e3f706e8d48756a54045314ffa0306559bd13514c337c9b6b5eb40860b762548a87
+EBUILD binutils-libs-2.31.1-r4.ebuild 3578 BLAKE2B 6e63f9ddb5dc2689b49fda177f1cc0e45cf34e2b22ba45a9b01d93cdfdfe0536053ef54e3ebf9798b924b7e979a63018eeedb1a1b14eb7d7eeca1f0513138708 SHA512 865f95c9cd08c7b8a12ec81baba14c1bc815587594a9129cedc1f7404e2a3055408d89e91b71aba2c347273582f27baeeaea386d1334e57bdc22158f5d4d717c
 EBUILD binutils-libs-2.31.1-r5.ebuild 3585 BLAKE2B 403607eeb970ece30ee77855a58a76ab4568da31b611b4680e7d5042d557bd21be2ec687a33d6f1e5304349507f9d7bd3c548729f03ad57861462d5b616a649c SHA512 6afedde5410e6d9b4eb1b5d1c98da2b2122e8bf0fc5b39001f641afac8b83b65862713a4cbff79b78302b13ef556231c5504404ee32672f76d9d951f9d1389bc
 EBUILD binutils-libs-2.32.ebuild 3584 BLAKE2B a55f76a6133c38ffb220a9c938fbaf83647ffb3f5a4e46ea1b37ff69dc505f7d93beec5e278305571db2c1c8eb2eb74b55998fbaf79271cb4c0d3796231c5726 SHA512 b4a5bf245132c7366b38f8bb032398ba2d85ef45d64a8115ad5596cd9ba7b34855536e0f121ac392cb79e5cd66530884121d1ce0d3766fb2db98f9e11af99e21
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
index fd7b93932621..c37485612711 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.31.1-r4.ebuild
@@ -23,7 +23,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 # -r1 is a one-off subslot bump where SONAME changed for bug #666100
 SLOT="0/${PV}-r1"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 94deca15b426..8f3175167fd9 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,15 +1,5 @@
-AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 BLAKE2B 66451cdde9aa221d437762d81066a2400574f26b7cf8613826c72f953a757ff09765727bec95f2fa4b3873724ca061dab6110e801f39a929f3b5b218a74b0589 SHA512 d1c51c573353b3b8ae6ab1bcc8c10eda5cad8b98fc7ab4848e4fbd8a8736174f3c3fd1b72dd80c72b1e54be78f1cae4dc1ab8130df25aa6d1495e5cbbaf3b9f6
-AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 BLAKE2B 8526ed453dc40716ebbe7e9acf9406db17b030d75505360b5e5d1e4d51d02c8558fc3e9539bc57077a7cdb5c82e91313fb168773e2d573f810938c4e851dc374 SHA512 e0a09f77b209a72ab577fe1e62126609fdddedf3fba0eec749c4b506cdf793779b48390f055a3594892120f694291f8340c0b6f51862e94c03fd516897138be7
-AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 BLAKE2B c52120d9a60860d7c5abe46ebeee1f3b09a8ff9da8dda372c789f319ea711e170d69c0d5d04daa187d7b4936c49eef5841add4cd7c68be6a351c0ef98856ba15 SHA512 0605b7964af87d1d6bdccea5c4d1bfe6267d4401b8bbf0c8bb689663e6bb3ef92eebad8be6c23ffdf6632a4d5e6098d8a403c3e84ffb21b5e87b5b1d1ec3512d
-AUX 2.17/glibc-2.17-hardened-pie.patch 1784 BLAKE2B 2f550fb8b5beb6063b77969da7ed179e23445fb76c67d8f463348a8bdb29e9987763ec2226ccb4bb2ef91e2968afb36f091606ff95bf533266b05fa7321556dc SHA512 9ecfe2b6c8c982a42786181d6507d5fa588a6868109065451f58a779848837bd5e69c32a24e43a186c2ff63a9784015c51487e342c87982ac074139e36c169fc
-AUX 2.18/glibc-2.18-gentoo-chk_fail.c 9384 BLAKE2B 81094d8c8d1274f0f106277805b550b6e85169e951d54ca43777603bca33a454414f69cd2fba39131266e5cc9b6b48e6b5a80e87ae5604228b55c24aead64377 SHA512 f7106e36fa49b0000192c281edfcd49338c825b8b8663ac9d7304e8fe8b2f44b39c6c82a741b8e8abce4cbe2fd72f64e3cfe7a18ff504a4b2b2d63e5c75d62b7
-AUX 2.18/glibc-2.18-gentoo-stack_chk_fail.c 9599 BLAKE2B 2ec9f78f2c5617c1ef38ee579ee329fa6b561eaea2e3966e04de132b31ca8da1f12ab27d36dc3bd9cfb25f05bd358bf9dca17478088716fc025967e10395df90 SHA512 97acbdb8aa87dd7e197a1577bd053374b1c8c30d6c82f4a71ef04409bf87b36a60322237cb79896ebdb49960fcaae4c4f2333497f5c255f67717b01d6d62c2d5
-AUX 2.18/glibc-2.18-hardened-inittls-nosysenter.patch 8981 BLAKE2B c830477eb0aeb8e5ddbc81eb5bda6710dd91f67433b87ed0df03ac31b8183008db47abdaaa944d3947e800872c7af39226881ebf3734d455d14f942199469e49 SHA512 98feb8f12dc5d2bb030ec7c6c77f3f9389ebc208fafc96496f316e577457dd991294d59735b013b17e1d10d5c7b63471d5b857d2334be78239a8ceb1ad62b1fc
 AUX 2.19/glibc-2.19-hardened-configure-picdefault.patch 865 BLAKE2B 81431d341d389f5401bdcbc162a52d0419d97afedaee71ab417780bbc273579fa9ccd8966a7afd172325460e1010f50843ce37574390b17a6156e7751093e0bd SHA512 d8e6fea72e240f1fde8a487958463140a84e8bd6bb5b176f8ce84a34df3137943db9016300884f3efdd4da130e342448e57ed0c0dc6eb2956d647286ce1d00ce
 AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 BLAKE2B 19d218e91b1d3d38c526838600d0393de47a0e59ca3e05651bd28becb401021ddd2f6ef77b8740ca4e400f094ab5fd196f092cf25b20729eb4d42e2a200b9e03 SHA512 79876b12871b3e7693340bfdf99276ac0dfd6ff30bc977a9526af9e681fcbab2f25d3ac9e2b33f027c968b38a4b670237de54ffd08edc418423ecd82dddd1d67
-AUX 2.20/glibc-2.20-gentoo-chk_fail.c 8978 BLAKE2B 5a41728d29fb7b7d5cbde47ad53db71a6563ddcf07c9da63642cd8616284f29c5d47f377292428bb3a9993b89ea32e6d7420b2d9ad8b3342ab4bb3c985a3c0e3 SHA512 5cb529ac9d18a315f25fd48a3a80a529924bee0588074c97e6df7dbe8568a67f786363c41da6300ea55818369e3609ed4315b2e2104f8a8b4f1266ba43076eda
-AUX 2.20/glibc-2.20-gentoo-stack_chk_fail.c 55 BLAKE2B a7b99997627b8fa110802d9427494487c5d3084312d892532c5aa263cadfbb35c58bc358161bbbdf74cc2c6629b616d3a78c9cff1d18e63aedd1445dbe43d773 SHA512 4dfec1bd17007b826110dcb73d09331a58b7a892c87de55b94480b14c28686442c567725b610082813411cf9911e180835a400a54ea704fe80f81cfba966a989
-AUX 2.20/glibc-2.20-hardened-inittls-nosysenter.patch 9951 BLAKE2B 107afc99f6862109d31828cb85f2ee2958b107055e04feb5aadca869cb5838ef7f6246f010388315c5bc071b34339f5241fd5d7b7935e8d096277fc48eded253 SHA512 a8302ee2963bd791be859233223b17cd154afbf04c13c046956bb1140d748272d7bcb3a6167ce8b61573ebcffe906dff064308374d2910656b8fad18480fe422
 AUX 2.25/glibc-2.25-gentoo-chk_fail.c 9068 BLAKE2B 6fabcbb981d92101ff3b97e8eed4da3c0ee4fc3d09ca344c2d0b7ee5e04fec66b5db314263541beeb1290bafa837795fef1a6300986de938d2958ba89a9c1f2f SHA512 4503002b0e2cee0b6efc4599152d24fcff330157d4e35992a77d0d83a2decc4cf2da2b8645a44d90d428a1d82300a4fd8d13c5937b7c89f368c12b3c9139be6f
 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
@@ -17,8 +7,6 @@ DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d
 DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908f60d894c6344a2fa09383b30c1633a0682bc668367c8a2f8c6fec2d41b6e2178d709a2bd8db57e8b2ab56ba263c7d56f819c15acd061 SHA512 98c766e913693ab42ff790557acde2a36a8001e2648046a685b21964200df8d4d52d8452d499c0068c6648284d086ce062c2d36e2c6c2fd8aacd232d193f2853
 DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e
 DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d
-DIST glibc-2.21-patches-7.tar.bz2 46894 BLAKE2B 5a15a3a5ca515351d5d41baaa59ae6b6d1c353f1500c3b8dcd6da895119c89afee9ef6afaa1e7d617f2cf7b7504635e5733429f65847acaa63c0a7bf8233ee9c SHA512 e4cca3d753c0b9d213c0ed85e3d08cbbf6517862b3a48af987e010abaf5a022b47330040ced183d30b5b934de7587e97b4342e51a6df3d5cfa768bdd8b43b756
-DIST glibc-2.21.tar.xz 12322092 BLAKE2B 1ce2be09787138262b59b56235e20777459e99861c65694b96f63d7faf24da8655882dd23b39c28a8a2d338c50710f76e1e4dc39a3f4ce9736ef2cbf7f99ed5b SHA512 8cded6693618bec115f678fcbd0b77556f97dfa8337608f66e37224aefa55b38765ba61cb4d58beea37b5934e5ec8e30bad58613707388484906f2a0ce77997d
 DIST glibc-2.22-patches-13.tar.bz2 74479 BLAKE2B 1ab31614e8334508a63c842f503a395ff3ebeaa33d1890eab1d9e2985cb39064960053f2bbf99ec3bdec0ba5a80d259ca6b964fcaed9d99dcb6da84ddb8dd364 SHA512 73517fc1502b0733d67ade1d1ba6168415f5da64f37045fac0b10ef57155bf6dfbe1876e4742d2543fcea0c935c179426f6fbb94f0205968392ef903d2f83897
 DIST glibc-2.22.tar.xz 12969072 BLAKE2B 36a2e08cf4c5c9396c414fcf5cf5f32d0a78a61e06a1309fbc5f560bed7a7f25a084f5f5c1097014d0911239c710ac9c06f6b6d603238b9c928dd286ebd05bbf SHA512 a8719f3a4f8aa5fa81711116fdafbea5082c6dfd85bd8c4cdce60571910263ab422b35bb8b55a84d37ccb146442133ba60a84d453ca4a439c8ccd35419bd051b
 DIST glibc-2.23-patches-8.tar.bz2 304199 BLAKE2B 693e40090dbe43f0e9c1faa0bce75e43d5d3924b40c141f9d00ef147fd285b03e2c3bab6a32d1bf6978ca139c3f071f685d5caf1bffb1cce7e1d1f3c346e5c50 SHA512 470814bbbd9d4ee5fa2dd7570a2e14b0229723e373e801472856fd6c2f089499eddc300f69b49af8ba0edbdca583ee3ca521fdb5c642509717cafea0ad925fd2
@@ -37,14 +25,13 @@ DIST glibc-2.29-patches-3.tar.xz 35812 BLAKE2B 90b8bc57b7a63f03617795c368b92e525
 DIST glibc-2.29.tar.xz 16515488 BLAKE2B b754e6825176538a2b8ca03fce014f0d87d333dc4d038bf0cda5ee8a2f484cd3ce93ad78ec126737e093ab64b55ceedf04cd08aecb4f8041daaa329e99717afa SHA512 146bc0769fe853d9edbf93cea7f74c5b3d84d69cb7614c62588e7acdecd1ec789a9d8949f3e8b99f8f36f2ccac740a003bed94f32b07817baf780b06cfeb6ed0
 DIST glibc-9999-patches-11.tar.xz 17804 BLAKE2B cb4ef9fbaf0da3e2307c468d2a6731ff2475f6ebc490f0ca43d375b59aa669bec1ad0580775306adb95e249e9641bed910310185e5dced66a491c1491b99a747 SHA512 d2fced779807c7f492c17958cf4f95273d1bdcfe062bd71546f2360f3d4742a696ec8d04d984ec560c0fcccea332446834ae2c9d28cfd9009ffd091c1084edc9
 EBUILD glibc-2.19-r2.ebuild 40484 BLAKE2B 9e78b3fcbf40c7c32fd9a7ba0f4c9d31277aa0d5465342b5af1a8115d4dbb9bc34e4dd0be6fe6abca2497306ef84018b62969ff2a2d28eeb092e204a60972714 SHA512 6ee461bd816a33b5eb37e3d7c107e09ebb912ce9cb26620e7bedadf31a5a874c822148859973d4e60931a46b668ce743b7ff04fa3df99f0089251ae653021750
-EBUILD glibc-2.21-r2.ebuild 4899 BLAKE2B 4097f29160b437edb96e6f731c797cba43bfb65fe164c1ffc3af0025d52c18a286b9a75d56d3e371e33e87f99a71a2115ba2eba7cb174dd2787a9b6a6d84b674 SHA512 68cc49c310ff816b2433b4f9e389e992d64f623809d4a4c3391dcce7ee4c385365ef4278de79bf4b6b9a4ed969e10b94bebabe86e560295bd1c0a9652aec12ec
 EBUILD glibc-2.22-r4.ebuild 4950 BLAKE2B 8d048dafaf8eec034d2ed2f3a8f400b3f4aedab39d7fe11795376a135ed9a42843f9cc6888e721ef242f78bc4230188d53cdccaf7686186d43201101519cc60b SHA512 64387259f921dc26d91d5d4e86bbbbfd740bb4b2e1337c121f799370abc9c6298745f9686e6aa501b10c05150ac1129ef8bd37d140e9c83c41ac3c0f54ee052f
 EBUILD glibc-2.23-r4.ebuild 4949 BLAKE2B 99db0ec4a452f04a2aef9b347a5ddec03cc88fbb1460c4f3f14b37efe5651b5db374e93a26b32b7918eb05f702d5355c5abcfcdf1228c24c4529218ecdd4017b SHA512 4384f936e1b88edc6639e4d7f31cc4641d287afda7e16f9cbd6a9fef68f04501213d9f2a84314cfb18d9da9b404a1452eba44fb49db8cf2cd1cd6012a659eb38
 EBUILD glibc-2.24-r4.ebuild 4988 BLAKE2B 8e08345c96e176984b73a073efca21f771d41af1af75106ec88a22bd55d7f69f28d9c01989026a3e58f3df4fac2a59db68d5ac8a8bbb0f411c75da8792f3402a SHA512 dd1d996eaf35197f7b7b6c111957eb98ef776d0a76a949b95f9bb17075dca43b2a354f8d15be133b9f3ff6c40a5b1f4ec28bd8d41c5cfc51da006eda8b005a05
 EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff8fca6b64c083c3e05d07533e445a6139939710b9284f7587bbf3977ca556caeb964e73ac21a382d942423d886a SHA512 f26645acc02f16209ec068641a800ef0a4ad2a422c9473e14a273fdece9b53074b837907d635a8585cf9dbb1acea14178166a4a3410aa4c70a745b89a764b6f1
 EBUILD glibc-2.26-r7.ebuild 25496 BLAKE2B 3edbb2f56d81869f86bd357772c27eb9516a1a0fbbda024412c8588df0b7938c77afc46430ea8b01bfe012eb5097f58b989411d4953d09d9202c33eeea562708 SHA512 e28a2cf8f692e6526fcbee2d9317dbb4cb8a4c249e4b60ed5b3522dc8c4627248b4a4bad0c32192adf0f650f3f002b8e25ebc7038fe0daf959f0dcde0bfe1bc4
 EBUILD glibc-2.27-r6.ebuild 41551 BLAKE2B 9b55701da5b61f4b095108f0042181961fc67a9b8a40d7ed70ca5effd8114a9d1769f2e9ed178fcf49069cb63c0ad9bdc53cf6f4526f98c3a7d41609d9e7574c SHA512 1d06a20e0a2dc7deee567a0e2545cea87cfbdf5f0d1037b85e2a6afa829b5106880d3b44f44adb7e790820eaa873aac442208f77f1e5c48411af8c1c94a16ce9
-EBUILD glibc-2.28-r6.ebuild 41326 BLAKE2B 45590a6672c1542606abffcac3d3ab6937df541828bc0c811db0329d8c24a33923aa840fc36bcf2e1d2abf5fc4ca557bfc02eef02fb2e6c4bfb5469cc53eb033 SHA512 c7719476f09f019b34d778dacdaa88dd6b9f589bbd2b271b8cc731af3cdd247cc4a6673206196b47fecabd79afa48c9b8cac56b7d0fbf1ead0931b143e51b750
+EBUILD glibc-2.28-r6.ebuild 41325 BLAKE2B 511294fea2bd8eed5a1a25964cbe05c83e423257c62f508ee278b7a18356d7c439faf3a4bb3fd2a224a5d2e9b7deff9c14eb9d7addf87724790564332bff3b18 SHA512 342ad4a399446e08dbde444209cbbbbe84e8f848f8a3f3965e4510da666b9190ec1328602b6b03cd009ba96582a7ca2403adf9869754071c155e9c99a9e4a0fe
 EBUILD glibc-2.29-r2.ebuild 41332 BLAKE2B 735a6beced63e6216ec6d9e4ae5dc7b6c654499f4f2ba43b48492be156e43aaaff150eb8af310c5c9093b96b321a1c07f9808cc79a0a19aa312d9be5d87f8e34 SHA512 270a2ebe13daca0c46e3a4090a2399c22459a55b4a25f832a8c98b7c9c515c363ff72d9ab0696b43d0fa605fee3d7a7667aa914c8c32faae96683731ede32116
 EBUILD glibc-9999.ebuild 41344 BLAKE2B 3a6cf234179c02ae4c68f8ca83e5123e1e464e1886c53ec2d3ea0e47447cc235926f3ceb4f950d20a91d54319a3f8551c7866d27e78df2d761a1fe12a6e18b3c SHA512 dd18c4d46a77ac92aa2537759287a90f7349e7a58ade218c57566192d46bfa5e4f0d5630216b46371a40792554c80fa6c3c70bdcd4dab0670435c1d7d935fc4a
 MISC metadata.xml 1323 BLAKE2B 6a19ccbf9f068c6c3d3b945d3011dce3d7712dd74a2daeaa8244eef73fd86723b275ce018ec5557862278c23883fabfb27e91e0b88ff62c34fffdadd4b024411 SHA512 848adbf531103d69b8b0e7017c25de730daecccae220e337e475ba8dbcaa95c6d5e440330be56367974607050dfa1964026ed90bc699ab5f12fef35c88d67505
diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c b/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c
deleted file mode 100644
index 37711e8aacbf..000000000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Copyright (C) 2006-2008 Gentoo Foundation Inc.
- * License terms as above.
- *
- * Hardened Gentoo SSP and FORTIFY handler
- *
- * An SSP failure handler that does not use functions from the rest of
- * glibc; it uses the INTERNAL_SYSCALL methods directly.  This ensures
- * no possibility of recursion into the handler.
- *
- * Direct all bug reports to http://bugs.gentoo.org/
- *
- * Re-written from the glibc-2.3 Hardened Gentoo SSP handler
- * by Kevin F. Quinn - <kevquinn[@]gentoo.org>
- *
- * The following people contributed to the glibc-2.3 Hardened
- * Gentoo SSP and FORTIFY handler, from which this implementation draws much:
- *
- * Ned Ludd - <solar[@]gentoo.org>
- * Alexander Gabert - <pappy[@]gentoo.org>
- * The PaX Team - <pageexec[@]freemail.hu>
- * Peter S. Mazinger - <ps.m[@]gmx.net>
- * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
- * Robert Connolly - <robert[@]linuxfromscratch.org>
- * Cory Visi <cory[@]visi.name>
- * Mike Frysinger <vapier[@]gentoo.org>
- * Magnus Granberg <zorry[@]ume.nu>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static char *__progname = "<rtld>";
-#else
-extern char *__progname;
-#endif
-
-/* Common handler code, used by chk_fail
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__ , __always_inline__))
-static inline void
-__hardened_gentoo_chk_fail(char func[], int damaged)
-{
-#define MESSAGE_BUFSIZ 256
-	static pid_t pid;
-	static int plen, i;
-	static char message[MESSAGE_BUFSIZ];
-	static const char msg_ssa[] = ": buffer overflow attack";
-	static const char msg_inf[] = " in function ";
-	static const char msg_ssd[] = "*** buffer overflow detected ***: ";
-	static const char msg_terminated[] = " - terminated\n";
-	static const char msg_report[] = "Report to http://bugs.gentoo.org/\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address
-	 */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) {
-		sock.sun_path[i] = path_log[i];
-		i++;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-		{i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \
-		{\
-			message[plen+i]=str[i];\
-			i++;\
-		}\
-		plen+=i;}
-
-	/* R.Henderson post-gcc-4 style message */
-	plen = 0;
-	strconcat(msg_ssd);
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Dr. Etoh pre-gcc-4 style message */
-	plen = 0;
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_ssa);
-	strconcat(msg_inf);
-	if (func != NULL)
-		strconcat(func)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Direct reports to bugs.gentoo.org */
-	plen=0;
-	strconcat(msg_report);
-	message[plen++]='\0';
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	if (log_socket != -1)
-		INLINE_SYSCALL(close, 1, log_socket);
-
-	/* Suicide */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		static struct sigaction default_abort_act;
-		/* Remove any user-supplied handler for SIGABRT, before using it */
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* Note; actions cannot be added to SIGKILL */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway
-	 * The loop prevents gcc thinking this routine returns
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 0);
-}
-
-__attribute__ ((__noreturn__))
-void __chk_fail(void)
-{
-	__hardened_gentoo_chk_fail(NULL, 0);
-}
-
diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch
deleted file mode 100644
index e75ccc788c89..000000000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Prevent default-fPIE from confusing configure into thinking
-PIC code is default.  This causes glibc to build both PIC and
-non-PIC code as normal, which on the hardened compiler generates
-PIC and PIE.
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-Fixed for glibc 2.10 by Magnus Granberg <zorry@ume.nu>
-
---- configure.in
-+++ configure.in
-@@ -2145,7 +2145,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*])
---- configure
-+++ configure
-@@ -7698,7 +7698,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*
diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
deleted file mode 100644
index cb6d8e3c78ba..000000000000
--- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-Fixed for 2.10 by Magnus Granberg <zorry@ume.nu>
-
---- csu/libc-start.c
-+++ csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -129,6 +130,11 @@
- #  endif
-   _dl_aux_init (auxvec);
- # endif
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_NOSYSENTER
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
---- csu/libc-tls.c
-+++ csu/libc-tls.c
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-@@ -29,6 +30,9 @@
-  #error makefile bug, this file is for static only
- #endif
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
- extern ElfW(Phdr) *_dl_phdr;
- extern size_t _dl_phnum;
- 
-@@ -141,14 +145,26 @@
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+     
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align);
-+# else
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
-+# endif
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align
-+		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# else
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# endif
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
---- misc/sbrk.c
-+++ misc/sbrk.c
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <stdint.h>
- #include <unistd.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used
-+     via dynamic loading in a statically linked program update
-+     __curbrk from the kernel's brk value.  That way two separate
-+     instances of __brk and __sbrk can share the heap, returning
-+     interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
- void *
- __sbrk (intptr_t increment)
- {
---- sysdeps/unix/sysv/linux/i386/brk.c
-+++ sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+ * if the SYSENTER version requires the TLS (which it does on i386).
-+ * Obviously using the TLS before it is initialised is broken. */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *__unbounded newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1,
-+						 __ptrvalue (addr));
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
- int
- __brk (void *addr)
- {
---- sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +495,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"
diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
deleted file mode 100644
index da4fb82539cf..000000000000
--- a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-2012-11-11  Magnus Granberg  <zorry@gentoo.org>
-
-	#442712
-	* Makeconfig (+link): Set to +link-pie.
-	(+link-static-before-libc): Change $(static-start-installed-name) to
-	S$(static-start-installed-name).
-	(+prector): Set to +prectorS.
-	(+postctor): Set to +postctorS.
-
---- libc/Makeconfig
-+++ libc/Makeconfig
-@@ -447,11 +447,12 @@
- 	     $(common-objpfx)libc% $(+postinit),$^) \
- 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
- endif
-++link = $(+link-pie)
- # Command for statically linking programs with the C library.
- ifndef +link-static
- +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
- 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
--	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
-+	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
- 	      $(+preinit) $(+prectorT) \
- 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
- 						     $(start-installed-name))\
-@@ -549,11 +550,10 @@
- ifeq ($(elf),yes)
- +preinit = $(addprefix $(csu-objpfx),crti.o)
- +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
--+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
--# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
-++prector = $(+prectorS)
-++postctor = $(+postctorS)
- # Variants of the two previous definitions for statically linking programs.
- +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o`
- +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
- +interp = $(addprefix $(elf-objpfx),interp.os)
- endif
- csu-objpfx = $(common-objpfx)csu/
diff --git a/sys-libs/glibc/files/2.18/glibc-2.18-gentoo-chk_fail.c b/sys-libs/glibc/files/2.18/glibc-2.18-gentoo-chk_fail.c
deleted file mode 100644
index c1934362f628..000000000000
--- a/sys-libs/glibc/files/2.18/glibc-2.18-gentoo-chk_fail.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Copyright (C) 2006-2013 Gentoo Foundation Inc.
- * License terms as above.
- *
- * Hardened Gentoo SSP and FORTIFY handler
- *
- * An SSP failure handler that does not use functions from the rest of
- * glibc; it uses the INTERNAL_SYSCALL methods directly.  This ensures
- * no possibility of recursion into the handler.
- *
- * Direct all bug reports to http://bugs.gentoo.org/
- *
- * Re-written from the glibc-2.3 Hardened Gentoo SSP handler
- * by Kevin F. Quinn - <kevquinn[@]gentoo.org>
- *
- * The following people contributed to the glibc-2.3 Hardened
- * Gentoo SSP and FORTIFY handler, from which this implementation draws much:
- *
- * Ned Ludd - <solar[@]gentoo.org>
- * Alexander Gabert - <pappy[@]gentoo.org>
- * The PaX Team - <pageexec[@]freemail.hu>
- * Peter S. Mazinger - <ps.m[@]gmx.net>
- * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
- * Robert Connolly - <robert[@]linuxfromscratch.org>
- * Cory Visi <cory[@]visi.name>
- * Mike Frysinger <vapier[@]gentoo.org>
- * Magnus Granberg <zorry[@]ume.nu>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static char *__progname = "<rtld>";
-#else
-extern char *__progname;
-#endif
-
-/* Common handler code, used by chk_fail
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__ , __always_inline__))
-static inline void
-__hardened_gentoo_chk_fail(char func[], int damaged)
-{
-#define MESSAGE_BUFSIZ 256
-	static pid_t pid;
-	static int plen, i;
-	static char message[MESSAGE_BUFSIZ];
-	static const char msg_ssa[] = ": buffer overflow attack";
-	static const char msg_inf[] = " in function ";
-	static const char msg_ssd[] = "*** buffer overflow detected ***: ";
-	static const char msg_terminated[] = " - terminated\n";
-	static const char msg_report[] = "Report to http://bugs.gentoo.org/\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address
-	 */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) {
-		sock.sun_path[i] = path_log[i];
-		i++;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-		{i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \
-		{\
-			message[plen+i]=str[i];\
-			i++;\
-		}\
-		plen+=i;}
-
-	/* R.Henderson post-gcc-4 style message */
-	plen = 0;
-	strconcat(msg_ssd);
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Dr. Etoh pre-gcc-4 style message */
-	plen = 0;
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_ssa);
-	strconcat(msg_inf);
-	if (func != NULL)
-		strconcat(func)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Direct reports to bugs.gentoo.org */
-	plen=0;
-	strconcat(msg_report);
-	message[plen++]='\0';
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	if (log_socket != -1)
-		INLINE_SYSCALL(close, 1, log_socket);
-
-	/* Suicide */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		static struct sigaction default_abort_act;
-		/* Remove any user-supplied handler for SIGABRT, before using it */
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* Note; actions cannot be added to SIGKILL */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway
-	 * The loop prevents gcc thinking this routine returns
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 0);
-}
-
-__attribute__ ((__noreturn__))
-void __chk_fail(void)
-{
-	__hardened_gentoo_chk_fail(NULL, 0);
-}
-
diff --git a/sys-libs/glibc/files/2.18/glibc-2.18-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.18/glibc-2.18-gentoo-stack_chk_fail.c
deleted file mode 100644
index 9535c2157895..000000000000
--- a/sys-libs/glibc/files/2.18/glibc-2.18-gentoo-stack_chk_fail.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Copyright (C) 2006-2013 Gentoo Foundation Inc.
- * License terms as above.
- *
- * Hardened Gentoo SSP handler
- *
- * An SSP failure handler that does not use functions from the rest of
- * glibc; it uses the INTERNAL_SYSCALL methods directly.  This ensures
- * no possibility of recursion into the handler.
- *
- * Direct all bug reports to http://bugs.gentoo.org/
- *
- * Re-written from the glibc-2.3 Hardened Gentoo SSP handler
- * by Kevin F. Quinn - <kevquinn[@]gentoo.org>
- * 
- * Fixed to support glibc-2.18 by Magnus Granberg - <zorry[@]gentoo.org>
- *
- * The following people contributed to the glibc-2.3 Hardened
- * Gentoo SSP handler, from which this implementation draws much:
- *
- * Ned Ludd - <solar[@]gentoo.org>
- * Alexander Gabert - <pappy[@]gentoo.org>
- * The PaX Team - <pageexec[@]freemail.hu>
- * Peter S. Mazinger - <ps.m[@]gmx.net>
- * Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
- * Robert Connolly - <robert[@]linuxfromscratch.org>
- * Cory Visi <cory[@]visi.name>
- * Mike Frysinger <vapier[@]gentoo.org>
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static char *__progname = "<rtld>";
-#else
-extern char *__progname;
-#endif
-
-
-/* Common handler code, used by stack_chk_fail and __stack_smash_handler
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__ , __always_inline__))
-static inline void
-__hardened_gentoo_stack_chk_fail(char func[], int damaged)
-{
-#define MESSAGE_BUFSIZ 256
-	static pid_t pid;
-	static int plen, i;
-	static char message[MESSAGE_BUFSIZ];
-	static const char msg_ssa[] = ": stack smashing attack";
-	static const char msg_inf[] = " in function ";
-	static const char msg_ssd[] = "*** stack smashing detected ***: ";
-	static const char msg_terminated[] = " - terminated\n";
-	static const char msg_report[] = "Report to http://bugs.gentoo.org/\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address
-	 */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) {
-		sock.sun_path[i] = path_log[i];
-		i++;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-		{i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \
-		{\
-			message[plen+i]=str[i];\
-			i++;\
-		}\
-		plen+=i;}
-
-	/* R.Henderson post-gcc-4 style message */
-	plen = 0;
-	strconcat(msg_ssd);
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Dr. Etoh pre-gcc-4 style message */
-	plen = 0;
-	if (__progname != (char *)0)
-		strconcat(__progname)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_ssa);
-	strconcat(msg_inf);
-	if (func != NULL)
-		strconcat(func)
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	/* Direct reports to bugs.gentoo.org */
-	plen=0;
-	strconcat(msg_report);
-	message[plen++]='\0';
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen);
-	if (connect_result != -1)
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-
-	if (log_socket != -1)
-		INLINE_SYSCALL(close, 1, log_socket);
-
-	/* Suicide */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		static struct sigaction default_abort_act;
-		/* Remove any user-supplied handler for SIGABRT, before using it */
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* Note; actions cannot be added to SIGKILL */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway
-	 * The loop prevents gcc thinking this routine returns
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 0);
-}
-
-__attribute__ ((__noreturn__))
-void __stack_chk_fail(void)
-{
-	__hardened_gentoo_stack_chk_fail(NULL, 0);
-}
-
-#ifdef ENABLE_OLD_SSP_COMPAT
-__attribute__ ((__noreturn__))
-void __stack_smash_handler(char func[], int damaged)
-{
-	__hardened_gentoo_stack_chk_fail(func, damaged);
-}
-#endif
diff --git a/sys-libs/glibc/files/2.18/glibc-2.18-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.18/glibc-2.18-hardened-inittls-nosysenter.patch
deleted file mode 100644
index 8907ab2c6a34..000000000000
--- a/sys-libs/glibc/files/2.18/glibc-2.18-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_NOSYSENTER is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-Fixed for 2.10 by Magnus Granberg <zorry@ume.nu>
-Fixed for 2.18 by Magnus Granberg <zorry@gentoo.org>
-
---- csu/libc-start.c
-+++ csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -170,7 +170,11 @@ LIBC_START_MAIN (int (*main) (int, char
-           GL(dl_phnum) = __ehdr_start.e_phnum;
-         }
-     }
--
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_NOSYSENTER
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
---- csu/libc-tls.c
-+++ csu/libc-tls.c
-@@ -22,14 +22,17 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
--
-+#include <sysdep.h>
- 
- #ifdef SHARED
-  #error makefile bug, this file is for static only
- #endif
- 
--dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
- 
-+dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];
- 
- static struct
- {
-@@ -139,14 +142,26 @@ __libc_setup_tls (size_t tcbsize, size_t
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+     
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align);
-+# else
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
-+#endif
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-+# ifdef INTERNAL_SYSCALL_NOSYSENTER
-+  tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align
-+		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+# else
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-+#endif
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
---- misc/sbrk.c
-+++ misc/sbrk.c
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <stdint.h>
- #include <unistd.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used
-+     via dynamic loading in a statically linked program update
-+     __curbrk from the kernel's brk value.  That way two separate
-+     instances of __brk and __sbrk can share the heap, returning
-+     interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
- void *
- __sbrk (intptr_t increment)
- {
---- sysdeps/unix/sysv/linux/i386/brk.c
-+++ sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,29 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_NOSYSENTER
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+ * if the SYSENTER version requires the TLS (which it does on i386).
-+ * Obviously using the TLS before it is initialised is broken. */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void * newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, addr);
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
- int
- __brk (void *addr)
- {
---- sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# if defined SHARED || defined __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +495,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ )
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"
diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c b/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c
deleted file mode 100644
index a8ab9d8a3e29..000000000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-   Copyright (C) 2006-2014 Gentoo Foundation Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Hardened Gentoo SSP and FORTIFY handler
-
-   A failure handler that does not use functions from the rest of glibc;
-   it uses the INTERNAL_SYSCALL methods directly.  This helps ensure no
-   possibility of recursion into the handler.
-
-   Direct all bug reports to http://bugs.gentoo.org/
-
-   People who have contributed significantly to the evolution of this file:
-   Ned Ludd - <solar[@]gentoo.org>
-   Alexander Gabert - <pappy[@]gentoo.org>
-   The PaX Team - <pageexec[@]freemail.hu>
-   Peter S. Mazinger - <ps.m[@]gmx.net>
-   Yoann Vandoorselaere - <yoann[@]prelude-ids.org>
-   Robert Connolly - <robert[@]linuxfromscratch.org>
-   Cory Visi <cory[@]visi.name>
-   Mike Frysinger <vapier[@]gentoo.org>
-   Magnus Granberg <zorry[@]gentoo.org>
-   Kevin F. Quinn - <kevquinn[@]gentoo.org>
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#include <alloca.h>
-/* from sysdeps */
-#include <socketcall.h>
-/* for the stuff in bits/socket.h */
-#include <sys/socket.h>
-#include <sys/un.h>
-
-/* Sanity check on SYSCALL macro names - force compilation
- * failure if the names used here do not exist
- */
-#if !defined __NR_socketcall && !defined __NR_socket
-# error Cannot do syscall socket or socketcall
-#endif
-#if !defined __NR_socketcall && !defined __NR_connect
-# error Cannot do syscall connect or socketcall
-#endif
-#ifndef __NR_write
-# error Cannot do syscall write
-#endif
-#ifndef __NR_close
-# error Cannot do syscall close
-#endif
-#ifndef __NR_getpid
-# error Cannot do syscall getpid
-#endif
-#ifndef __NR_kill
-# error Cannot do syscall kill
-#endif
-#ifndef __NR_exit
-# error Cannot do syscall exit
-#endif
-#ifdef SSP_SMASH_DUMPS_CORE
-# define ENABLE_SSP_SMASH_DUMPS_CORE 1
-# if !defined _KERNEL_NSIG && !defined _NSIG
-#  error No _NSIG or _KERNEL_NSIG for rt_sigaction
-# endif
-# if !defined __NR_sigaction && !defined __NR_rt_sigaction
-#  error Cannot do syscall sigaction or rt_sigaction
-# endif
-/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size
- * of the _kernel_ sigset_t which is not the same as the user sigset_t.
- * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for
- * some reason.
- */
-# ifdef _KERNEL_NSIG
-#  define _SSP_NSIG _KERNEL_NSIG
-# else
-#  define _SSP_NSIG _NSIG
-# endif
-#else
-# define _SSP_NSIG 0
-# define ENABLE_SSP_SMASH_DUMPS_CORE 0
-#endif
-
-/* Define DO_SIGACTION - default to newer rt signal interface but
- * fallback to old as needed.
- */
-#ifdef __NR_rt_sigaction
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8)
-#else
-# define DO_SIGACTION(signum, act, oldact) \
-	INLINE_SYSCALL(sigaction, 3, signum, act, oldact)
-#endif
-
-/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */
-#if defined(__NR_socket) && defined(__NR_connect)
-# define USE_OLD_SOCKETCALL 0
-#else
-# define USE_OLD_SOCKETCALL 1
-#endif
-
-/* stub out the __NR_'s so we can let gcc optimize away dead code */
-#ifndef __NR_socketcall
-# define __NR_socketcall 0
-#endif
-#ifndef __NR_socket
-# define __NR_socket 0
-#endif
-#ifndef __NR_connect
-# define __NR_connect 0
-#endif
-#define DO_SOCKET(result, domain, type, protocol) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = domain; \
-			socketargs[1] = type; \
-			socketargs[2] = protocol; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \
-	} while (0)
-#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \
-	do { \
-		if (USE_OLD_SOCKETCALL) { \
-			socketargs[0] = sockfd; \
-			socketargs[1] = (unsigned long int)serv_addr; \
-			socketargs[2] = addrlen; \
-			socketargs[3] = 0; \
-			result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \
-		} else \
-			result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \
-	} while (0)
-
-#ifndef _PATH_LOG
-# define _PATH_LOG "/dev/log"
-#endif
-
-static const char path_log[] = _PATH_LOG;
-
-/* For building glibc with SSP switched on, define __progname to a
- * constant if building for the run-time loader, to avoid pulling
- * in more of libc.so into ld.so
- */
-#ifdef IS_IN_rtld
-static const char *__progname = "<ldso>";
-#else
-extern const char *__progname;
-#endif
-
-#ifdef GENTOO_SSP_HANDLER
-# define ERROR_MSG "stack smashing"
-#else
-# define ERROR_MSG "buffer overflow"
-#endif
-
-/* Common handler code, used by chk_fail
- * Inlined to ensure no self-references to the handler within itself.
- * Data static to avoid putting more than necessary on the stack,
- * to aid core debugging.
- */
-__attribute__ ((__noreturn__, __always_inline__))
-static inline void
-__hardened_gentoo_fail(void)
-{
-#define MESSAGE_BUFSIZ 512
-	static pid_t pid;
-	static int plen, i, hlen;
-	static char message[MESSAGE_BUFSIZ];
-	/* <11> is LOG_USER|LOG_ERR. A dummy date for loggers to skip over. */
-	static const char msg_header[] = "<11>" __DATE__ " " __TIME__ " glibc-gentoo-hardened-check: ";
-	static const char msg_ssd[] = "*** " ERROR_MSG " detected ***: ";
-	static const char msg_terminated[] = " terminated; ";
-	static const char msg_report[] = "report to " REPORT_BUGS_TO "\n";
-	static const char msg_unknown[] = "<unknown>";
-	static int log_socket, connect_result;
-	static struct sockaddr_un sock;
-	static unsigned long int socketargs[4];
-
-	/* Build socket address */
-	sock.sun_family = AF_UNIX;
-	i = 0;
-	while (path_log[i] != '\0' && i < sizeof(sock.sun_path) - 1) {
-		sock.sun_path[i] = path_log[i];
-		++i;
-	}
-	sock.sun_path[i] = '\0';
-
-	/* Try SOCK_DGRAM connection to syslog */
-	connect_result = -1;
-	DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0);
-	if (log_socket != -1)
-		DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	if (connect_result == -1) {
-		if (log_socket != -1)
-			INLINE_SYSCALL(close, 1, log_socket);
-		/* Try SOCK_STREAM connection to syslog */
-		DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0);
-		if (log_socket != -1)
-			DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock));
-	}
-
-	/* Build message.  Messages are generated both in the old style and new style,
-	 * so that log watchers that are configured for the old-style message continue
-	 * to work.
-	 */
-#define strconcat(str) \
-	({ \
-		i = 0; \
-		while ((str[i] != '\0') && ((i + plen) < (MESSAGE_BUFSIZ - 1))) { \
-			message[plen + i] = str[i]; \
-			++i; \
-		} \
-		plen += i; \
-	})
-
-	/* Tersely log the failure */
-	plen = 0;
-	strconcat(msg_header);
-	hlen = plen;
-	strconcat(msg_ssd);
-	if (__progname != NULL)
-		strconcat(__progname);
-	else
-		strconcat(msg_unknown);
-	strconcat(msg_terminated);
-	strconcat(msg_report);
-
-	/* Write out error message to STDERR, to syslog if open */
-	INLINE_SYSCALL(write, 3, STDERR_FILENO, message + hlen, plen - hlen);
-	if (connect_result != -1) {
-		INLINE_SYSCALL(write, 3, log_socket, message, plen);
-		INLINE_SYSCALL(close, 1, log_socket);
-	}
-
-	/* Time to kill self since we have no idea what is going on */
-	pid = INLINE_SYSCALL(getpid, 0);
-
-	if (ENABLE_SSP_SMASH_DUMPS_CORE) {
-		/* Remove any user-supplied handler for SIGABRT, before using it. */
-#if 0
-		/*
-		 * Note: Disabled because some programs catch & process their
-		 * own crashes.  We've already enabled this code path which
-		 * means we want to let core dumps happen.
-		 */
-		static struct sigaction default_abort_act;
-		default_abort_act.sa_handler = SIG_DFL;
-		default_abort_act.sa_sigaction = NULL;
-		__sigfillset(&default_abort_act.sa_mask);
-		default_abort_act.sa_flags = 0;
-		if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0)
-#endif
-			INLINE_SYSCALL(kill, 2, pid, SIGABRT);
-	}
-
-	/* SIGKILL is only signal which cannot be caught */
-	INLINE_SYSCALL(kill, 2, pid, SIGKILL);
-
-	/* In case the kill didn't work, exit anyway.
-	 * The loop prevents gcc thinking this routine returns.
-	 */
-	while (1)
-		INLINE_SYSCALL(exit, 1, 137);
-}
-
-__attribute__ ((__noreturn__))
-#ifdef GENTOO_SSP_HANDLER
-void __stack_chk_fail(void)
-#else
-void __chk_fail(void)
-#endif
-{
-	__hardened_gentoo_fail();
-}
diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c
deleted file mode 100644
index 4a537bb52c5f..000000000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define GENTOO_SSP_HANDLER
-#include <debug/chk_fail.c>
diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
deleted file mode 100644
index 35eabe94014a..000000000000
--- a/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-When building glibc PIE (which is not something upstream support),
-several modifications are necessary to the glibc build process.
-
-First, any syscalls in PIEs must be of the PIC variant, otherwise
-textrels ensue.  Then, any syscalls made before the initialisation
-of the TLS will fail on i386, as the sysenter variant on i386 uses
-the TLS, giving rise to a chicken-and-egg situation.  This patch
-defines a PIC syscall variant that doesn't use sysenter, even when the sysenter
-version is normally used, and uses the non-sysenter version for the brk
-syscall that is performed by the TLS initialisation.  Further, the TLS
-initialisation is moved in this case prior to the initialisation of
-dl_osversion, as that requires further syscalls.
-
-csu/libc-start.c: Move initial TLS initialization to before the
-initialisation of dl_osversion, when INTERNAL_SYSCALL_PRE_TLS is defined
-
-csu/libc-tls.c: Use the no-sysenter version of sbrk when
-INTERNAL_SYSCALL_PRE_TLS is defined.
-
-misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter
-version of brk - if INTERNAL_SYSCALL_PRE_TLS is defined.
-
-misc/brk.c: Define a no-sysenter version of brk if
-INTERNAL_SYSCALL_PRE_TLS is defined.
-
-sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_PRE_TLS
-Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED.
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-Fixed for 2.10 by Magnus Granberg <zorry@ume.nu>
-Fixed for 2.18 by Magnus Granberg <zorry@gentoo.org>
-Fixed for 2.20 by Francisco Blas Izquierdo Riera <klondike@gentoo.org>
-
---- a/csu/libc-start.c
-+++ b/csu/libc-start.c
-@@ -28,6 +28,7 @@
- extern int __libc_multiple_libcs;
- 
- #include <tls.h>
-+#include <sysdep.h>
- #ifndef SHARED
- # include <dl-osinfo.h>
- extern void __pthread_initialize_minimal (void);
-@@ -170,6 +171,11 @@ LIBC_START_MAIN (int (*main) (int, char
-         }
-     }
- 
-+# ifdef INTERNAL_SYSCALL_PRE_TLS
-+  /* Do the initial TLS initialization before _dl_osversion,
-+     since the latter uses the uname syscall.  */
-+  __pthread_initialize_minimal ();
-+# endif
- # ifdef DL_SYSDEP_OSCHECK
-   if (!__libc_multiple_libcs)
-     {
-@@ -138,10 +144,12 @@
-     }
- # endif
- 
-+# ifndef INTERNAL_SYSCALL_PRE_TLS
-   /* Initialize the thread library at least a bit since the libgcc
-      functions are using thread functions if these are available and
-      we need to setup errno.  */
-   __pthread_initialize_minimal ();
-+# endif
- 
-   /* Set up the stack checker's canary.  */
-   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
---- a/csu/libc-tls.c
-+++ b/csu/libc-tls.c
-@@ -22,12 +22,17 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sysdep.h>
- 
- 
- #ifdef SHARED
-  #error makefile bug, this file is for static only
- #endif
- 
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+extern void *__sbrk_nosysenter (intptr_t __delta);
-+#endif
-+
- dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];
- 
- 
-@@ -139,20 +144,29 @@ __libc_setup_tls (size_t tcbsize, size_t
- 
-      The initialized value of _dl_tls_static_size is provided by dl-open.c
-      to request some surplus that permits dynamic loading of modules with
--     IE-model TLS.  */
-+     IE-model TLS.
-+
-+     Where the normal sbrk would use a syscall that needs the TLS (i386)
-+     use the special non-sysenter version instead.  */
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+# define __sbrk __sbrk_nosysenter
-+#endif
- #if TLS_TCB_AT_TP
-   tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign);
-   tlsblock = __sbrk (tcb_offset + tcbsize + max_align);
- #elif TLS_DTV_AT_TP
-   tcb_offset = roundup (tcbsize, align ?: 1);
-   tlsblock = __sbrk (tcb_offset + memsz + max_align
- 		     + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size));
-   tlsblock += TLS_PRE_TCB_SIZE;
- #else
-   /* In case a model with a different layout for the TCB and DTV
-      is defined add another #elif here and in the following #ifs.  */
- # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
- #endif
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+# undef __sbrk
-+#endif
- 
-   /* Align the TLS block.  */
-   tlsblock = (void *) (((uintptr_t) tlsblock + max_align - 1)
---- a/misc/sbrk.c
-+++ b/misc/sbrk.c
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <stdint.h>
- #include <unistd.h>
-+#include <sysdep.h>
- 
- /* Defined in brk.c.  */
- extern void *__curbrk;
-@@ -29,6 +30,35 @@
- /* Extend the process's data space by INCREMENT.
-    If INCREMENT is negative, shrink data space by - INCREMENT.
-    Return start of new space allocated, or -1 for errors.  */
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken. */
-+extern int __brk_nosysenter (void *addr);
-+void *
-+__sbrk_nosysenter (intptr_t increment)
-+{
-+  void *oldbrk;
-+
-+  /* If this is not part of the dynamic library or the library is used via
-+     dynamic loading in a statically linked program update __curbrk from the
-+     kernel's brk value.  That way two separate instances of __brk and __sbrk
-+     can share the heap, returning interleaved pieces of it.  */
-+  if (__curbrk == NULL || __libc_multiple_libcs)
-+    if (__brk_nosysenter (0) < 0)		/* Initialize the break.  */
-+      return (void *) -1;
-+
-+  if (increment == 0)
-+    return __curbrk;
-+
-+  oldbrk = __curbrk;
-+  if (__brk_nosysenter (oldbrk + increment) < 0)
-+    return (void *) -1;
-+
-+  return oldbrk;
-+}
-+#endif
-+
- void *
- __sbrk (intptr_t increment)
- {
---- a/sysdeps/unix/sysv/linux/i386/brk.c
-+++ b/sysdeps/unix/sysv/linux/i386/brk.c
-@@ -31,6 +31,30 @@
-    linker.  */
- weak_alias (__curbrk, ___brk_addr)
- 
-+#ifdef INTERNAL_SYSCALL_PRE_TLS
-+/* This version is used by csu/libc-tls.c whem initialising the TLS
-+   if the SYSENTER version requires the TLS (which it does on i386).
-+   Obviously using the TLS before it is initialised is broken.  */
-+int
-+__brk_nosysenter (void *addr)
-+{
-+  void *newbrk;
-+
-+  INTERNAL_SYSCALL_DECL (err);
-+  newbrk = (void *) INTERNAL_SYSCALL_PRE_TLS (brk, err, 1, addr);
-+
-+  __curbrk = newbrk;
-+
-+  if (newbrk < addr)
-+    {
-+      __set_errno (ENOMEM);
-+      return -1;
-+    }
-+
-+  return 0;
-+}
-+#endif
-+
- int
- __brk (void *addr)
- {
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -187,7 +187,7 @@
- /* The original calling convention for system calls on Linux/i386 is
-    to use int $0x80.  */
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# ifdef __PIC__
- #  define ENTER_KERNEL call *%gs:SYSINFO_OFFSET
- # else
- #  define ENTER_KERNEL call *_dl_sysinfo
-@@ -358,7 +358,7 @@
-    possible to use more than four parameters.  */
- #undef INTERNAL_SYSCALL
- #ifdef I386_USE_SYSENTER
--# ifdef SHARED
-+# ifdef __PIC__
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-     register unsigned int resultvar;					      \
-@@ -384,6 +384,18 @@
-     : "0" (name), "i" (offsetof (tcbhead_t, sysinfo))			      \
-       ASMFMT_##nr(args) : "memory", "cc");				      \
-     (int) resultvar; })
-+#  define INTERNAL_SYSCALL_PRE_TLS(name, err, nr, args...) \
-+  ({									      \
-+    register unsigned int resultvar;					      \
-+    EXTRAVAR_##nr							      \
-+    asm volatile (							      \
-+    LOADARGS_NOSYSENTER_##nr						      \
-+    "movl %1, %%eax\n\t"						      \
-+    "int $0x80\n\t"							      \
-+    RESTOREARGS_NOSYSENTER_##nr						      \
-+    : "=a" (resultvar)							      \
-+    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-+    (int) resultvar; })
- # else
- #  define INTERNAL_SYSCALL(name, err, nr, args...) \
-   ({									      \
-@@ -447,12 +459,20 @@
- 
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && defined __PIC__
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k3, %k3\n\t"
- #  define LOADARGS_5 \
-     "movl %%ebx, %4\n\t"						      \
-     "movl %3, %%ebx\n\t"
-+#  define LOADARGS_NOSYSENTER_1 \
-+    "bpushl .L__X'%k2, %k2\n\t"
-+#  define LOADARGS_NOSYSENTER_2	LOADARGS_NOSYSENTER_1
-+#  define LOADARGS_NOSYSENTER_3	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_4	LOADARGS_3
-+#  define LOADARGS_NOSYSENTER_5 \
-+    "movl %%ebx, %3\n\t"						      \
-+    "movl %2, %%ebx\n\t"
- # else
- #  define LOADARGS_1 \
-     "bpushl .L__X'%k2, %k2\n\t"
-@@ -474,11 +494,18 @@
- 
- #define RESTOREARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER && defined SHARED
-+# if defined I386_USE_SYSENTER && defined __PIC__
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k3, %k3\n\t"
- #  define RESTOREARGS_5 \
-     "movl %4, %%ebx"
-+#  define RESTOREARGS_NOSYSENTER_1 \
-+    "bpopl .L__X'%k2, %k2\n\t"
-+#  define RESTOREARGS_NOSYSENTER_2	RESTOREARGS_NOSYSENTER_1
-+#  define RESTOREARGS_NOSYSENTER_3	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_4	RESTOREARGS_3
-+#  define RESTOREARGS_NOSYSENTER_5 \
-+    "movl %3, %%ebx"
- # else
- #  define RESTOREARGS_1 \
-     "bpopl .L__X'%k2, %k2\n\t"
---- a/sysdeps/i386/nptl/tls.h
-+++ b/sysdeps/i386/nptl/tls.h
-@@ -189,6 +189,15 @@
-   desc->vals[3] = 0x51;
- }
- 
-+/* We have no sysenter until the tls is initialized which is a
-+   problem for PIC. Thus we need to do the right call depending
-+   on the situation.  */
-+#ifndef INTERNAL_SYSCALL_PRE_TLS
-+# define TLS_INIT_SYSCALL INTERNAL_SYSCALL
-+#else
-+# define TLS_INIT_SYSCALL INTERNAL_SYSCALL_PRE_TLS
-+#endif
-+
- /* Code to initially initialize the thread pointer.  This might need
-    special attention since 'errno' is not yet available and if the
-    operation can cause a failure 'errno' must not be touched.  */
-@@ -209,7 +218,7 @@
- 									      \
-      /* Install the TLS.  */						      \
-      INTERNAL_SYSCALL_DECL (err);					      \
--     _result = INTERNAL_SYSCALL (set_thread_area, err, 1, &_segdescr.desc);   \
-+     _result = TLS_INIT_SYSCALL (set_thread_area, err, 1, &_segdescr.desc);   \
- 									      \
-      if (_result == 0)							      \
-        /* We know the index in the GDT, now load the segment register.	      \
diff --git a/sys-libs/glibc/glibc-2.21-r2.ebuild b/sys-libs/glibc/glibc-2.21-r2.ebuild
deleted file mode 100644
index accbd33c95a3..000000000000
--- a/sys-libs/glibc/glibc-2.21-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-glibc
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
-	EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
-	inherit git-r3
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-PATCH_VER="7"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-DEPEND=">=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	selinux? ( sys-libs/libselinux )
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.6
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.6
-		virtual/os-headers"
-	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
-	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
-	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-	devspace=${devspace//HTTP/https://dev.gentoo.org/}
-	echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
-	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
-	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-src_unpack() {
-	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-
-	toolchain-glibc_src_unpack
-}
-
-src_prepare() {
-	toolchain-glibc_src_prepare
-
-	cd "${S}"
-
-	epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
-
-	if use hardened ; then
-		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		tc-enables-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-		epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
-		# We don't enable these for non-hardened as the output is very terse --
-		# it only states that a crash happened.  The default upstream behavior
-		# includes backtraces and symbols.
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
-
-		if use debug ; then
-			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile || die
-		fi
-
-		# Build various bits with ssp-all
-		sed -i \
-			-e 's:-fstack-protector$:-fstack-protector-all:' \
-			*/Makefile || die
-	fi
-
-	case $(gcc-fullversion) in
-	4.8.[0-3]|4.9.0)
-		eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
-		eerror "glibc.  See https://bugs.gentoo.org/547420 for details."
-		die "need to switch compilers #547420"
-		;;
-	esac
-}
diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild
index 8b515a70e87f..632b6cdb92bd 100644
--- a/sys-libs/glibc/glibc-2.28-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r6.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/libhx/Manifest b/sys-libs/libhx/Manifest
index 5aaaf3ea80d1..c0d7828e0aff 100644
--- a/sys-libs/libhx/Manifest
+++ b/sys-libs/libhx/Manifest
@@ -1,9 +1,6 @@
 AUX libhx-3.22-no-lyx.patch 495 BLAKE2B ae31b2ada8230a223413e4f7470b7743592191e829800b05124781660888bca1f153e287af5e79e106cd590539a64880e6d111054fb0ee31e9cd02cf65d59f01 SHA512 f4299755b65c7e3b64937df81feed58851bfe7e4938c4b47cd94f818bb7d5c80eecac34b7e80b1c051b07490b3730cc74d6f38cd47a7c4321882a8715ff4b802
-DIST libHX-3.16.tar.xz 867336 BLAKE2B 2c70e792b8257081c587e983810c4e94170f0e035359ec29b526692cf49b415362301dbe3f00de9947962fc874439c6a10497fc8a2c48d6ea8ffc489189867dd SHA512 d5c6f4ac889f4d1043d58742305632c78143c683be09ddd4288c3911747d4c5c6b33b4c1517813066f7933d87dcb7b8cd1dfb015f08c7e7afccc718899cdd259
 DIST libHX-3.22.tar.xz 875516 BLAKE2B 1a782834bb792898275ed549eff1b70b3356f9efe7b58e6aa48e34492b3ad8b5e8a66a142643ad6c13163e5eab6762fdcebd3fe4897d8b0d3f75c80f7ef60b6c SHA512 4a50b7171be9f60e1a1bfefb0641f74fa8879c0edb258533ee04ec89617802c48358dc244497fb18d02dc37f828f79f7c52dd5ce2a07d8a2f5e6e6f7b4e97646
 DIST libHX-3.24.tar.xz 876992 BLAKE2B 518b99e78acc0cb412f444c0dacaae830a853294a0ee549facfbe65a423a9f32d0388e30e255c87c3f5325102bea45e5e9d72d3fce5b89139b689fddcb299f93 SHA512 faf7af53b628efe1531568ccb2b7e9910db833b14583ab1487eb6a554b407a7546bc75348f7d2344c29ab53fd2df061f6f8de8db634bbd62c3672dc4347d27e4
-EBUILD libhx-3.16.ebuild 562 BLAKE2B 4dee90b98349e676eecd4a5eaeb84e2740b1174588042c9d43d27e9ce66916e09eb6b2b108e50e6984a083954a66ca9f4149f4b78d8c6e3c375a0ae011761295 SHA512 54cb5f94b0da5796bd84d6f9ed825dcbce7b2c453107a2353514cbc0260299194c02d2bdd6f37543c875c11472d3f3f2f32bd04ddd28e1bce6e5c894b44a1649
 EBUILD libhx-3.22-r1.ebuild 704 BLAKE2B 38a5567fb37d56a55c47d64667324fc4ea78d585247922ee2d1128f801e80911fc2e0704f154add5331b3c0bcc0c5363475a4adcb4f3e17bbc04fe0628bf52eb SHA512 b02728cf4b52e6739de5ac0aa232c43e020fbbcb38fe995033fdbee48ee3b606b2006a23c1bfd0401736d23aeb030209c1fdd69bf971a17062a11501782a2a84
-EBUILD libhx-3.22.ebuild 565 BLAKE2B a78d16fbb551a64786290a61d492d630fb6fa7a5c27396c69924334080c39b3ddfcff11cfb4d89191a49d830bc3bcac8684aeb3a0d5aaf064742197c0b241fc5 SHA512 4c6e03bf3fc8fbb16ae64c02ae3f3293828ea0409aab2ec6f730a06b5131fdf5b5f9908b62c60ca6fc72e35cfc63c61d36987b8d28def5343977c84904ca923e
-EBUILD libhx-3.24.ebuild 718 BLAKE2B 1fb5c07cb86d7fa58289a89eadc5e58a1557963b0361b82c448c99bf6fcff077dd6921933bd2854eed0ec7d8edea2b36b20b70a1d960c6b9bfb85e9ad6edaf95 SHA512 95e4296c181df331058d72bf29febf7dfb0d4d165d5154ca89977f2d7f6663dd5d0223e8ed8d69142b30eb8986d054a9a58871a8fa8b773bde061347d42d5077
+EBUILD libhx-3.24.ebuild 717 BLAKE2B 7e1fe97ca9d55e316515a1726e2ada842db30087ced54cb272ab17fb352c5470cb8fef626c0d48927f47e0dde9844679690e36568f1989871c2561dc1a5f97c9 SHA512 aec3f99b530a79b3dbc8cc13bbe3de57ce7def62b0c29e6f8c9d5be7a434f16a1aa3ebdd40509de96171c412ee506e6a965d4218c0b7b54dd66d43d198b6a395
 MISC metadata.xml 398 BLAKE2B f72cf11453ffa182e00a8c32e0f1160e2d0ad9f5659ebc76e4139e5494eb3f7e4f5256a7a92e70ebe5b82912a57dd45ca02317557c789958091d2b68a28d884f SHA512 74a2fb87430a3e105fcfdacdbd594f9f64710749760ec4b49f6c7c3fec64f59641c5204b72481d436ae8abd46438b27d04d392ce7d93be68613608909c772fd0
diff --git a/sys-libs/libhx/libhx-3.16.ebuild b/sys-libs/libhx/libhx-3.16.ebuild
deleted file mode 100644
index f089d0738420..000000000000
--- a/sys-libs/libhx/libhx-3.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Platform independent library providing basic system functions"
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S="${WORKDIR}/libHX-${PV}"
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	prune_libtool_files --all
-}
diff --git a/sys-libs/libhx/libhx-3.22.ebuild b/sys-libs/libhx/libhx-3.22.ebuild
deleted file mode 100644
index 2790a6dacad8..000000000000
--- a/sys-libs/libhx/libhx-3.22.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Platform independent library providing basic system functions"
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S="${WORKDIR}/libHX-${PV}"
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	prune_libtool_files --all
-}
diff --git a/sys-libs/libhx/libhx-3.24.ebuild b/sys-libs/libhx/libhx-3.24.ebuild
index c1cf2e00fd1d..6360828e2bdb 100644
--- a/sys-libs/libhx/libhx-3.24.ebuild
+++ b/sys-libs/libhx/libhx-3.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="doc"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 3a7e140d6476..7221b60a5376 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -5,7 +5,9 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
 DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
+DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
 EBUILD musl-1.1.20-r1.ebuild 3131 BLAKE2B aa772ac4c028022eb5bebffeb746b8f9393376966f1b1feaa2d6c10d58d0cabf91bbafd9d70aa37fdf00e458141da01498d9e4c90d28c92538ea5f12ca0fe7ea SHA512 7312e4ed0a7d7de47e8ccaba7d5e752f8afac2d4c2e128500f93101e4cd02702ecf96acf0107e0359df8e96228fc276540541146cc4d062f5687ec26b10dc2ad
 EBUILD musl-1.1.21.ebuild 3050 BLAKE2B bec489a792cf8793c8a1ce14041f8210eb96a9159fb3a93ae52d810e878fb9a29e3a0fc5fcbc466a4756fdf73d45b4c28a154df2887067898430ef1f29a372d2 SHA512 40ca12c1c2e65b0f598f91ea0fbc2ddf374e7d6797d5fea19c5c33d4f68882da9e69f333a34e26bb54bef4741920f964e4a5941704d675963f8c10c36af79816
+EBUILD musl-1.1.22.ebuild 3054 BLAKE2B a7fab7e588b3dc356ebcae705ba9eecd5656fdeb01a0fb76b7d7815642e33b356cb655cfefa98c4a471c0b2c7bc40073b8b36ecde8e331ae6585ba059a9b54eb SHA512 1251eab79c1aeb716912d350cef661fe67bc1c030f57e5922d7b534d03c2d0de3e8b3d2c61bedef6160fcceeefd62524d987d067de443cde048e598a5c8f0346
 EBUILD musl-9999.ebuild 3054 BLAKE2B a7fab7e588b3dc356ebcae705ba9eecd5656fdeb01a0fb76b7d7815642e33b356cb655cfefa98c4a471c0b2c7bc40073b8b36ecde8e331ae6585ba059a9b54eb SHA512 1251eab79c1aeb716912d350cef661fe67bc1c030f57e5922d7b534d03c2d0de3e8b3d2c61bedef6160fcceeefd62524d987d067de443cde048e598a5c8f0346
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
new file mode 100644
index 000000000000..22f16fa8bfb0
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+	SRC_URI="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+	fi
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig || die
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index fb4f79c56276..9e4d73138ed0 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,7 +1,5 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286
 AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD zlib-1.2.11-r1.ebuild 3029 BLAKE2B 7264674176992d231b0e70a7511de1e44f29f57b4facf4c6774854235c0fa0c1a29b11aa8ca7dde025c1990a88489a620d1d012a9634d82d9b75353fd19b5845 SHA512 be364c4b76bbbfe15de428a72bad82575078e1e4ebbfbaecafe7c409bcaece2e03d85415364abc5e4cd959ef602189dc21433196ed94c301f47306afddb67af2
 EBUILD zlib-1.2.11-r2.ebuild 3106 BLAKE2B e7dad456bf69ec2819455a83f2e04cd59c380beee4de2259e2475c0dbd6bed88e983c7b6804a29e22ccfe75ddf148fe29623ed2a6b15670e9ff30aae52641b08 SHA512 779c50acda9bb5e5257d539025753eaa9a6d4489e69720ee4ebfe37a3307e7e2b953d04f8fe9f9c7b4e99ffb58e9dfa1032d77a1002782172b821cca5e4edfc3
-EBUILD zlib-1.2.11.ebuild 2963 BLAKE2B 73b5a86f22babd1b34c8f4a4941114094c948e52ea0e31b092878a5c566e931ecaada4344ba8f038fe7808f9949da32bd9bd5710025195343a650f36d2b0b912 SHA512 851835307c49a56e87c1b741b00a2c69d904978cccf0f236cf09c58169b7ee638e2694797a867825096f94eb77d96f400d6bdd01d78d767e3ec41e91ba3521e5
 MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
deleted file mode 100644
index aeddd1a694db..000000000000
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="https://zlib.net/${P}.tar.gz
-	http://www.gzip.org/zlib/${P}.tar.gz
-	http://www.zlib.net/current/beta/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="minizip static-libs"
-
-DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
-
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		# uses preconfigured Makefile rather than configure script
-		multilib_copy_sources
-		;;
-	esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		;;
-	*)      # not an autoconf script, so can't use econf
-		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
-		echoit "${S}"/configure \
-			--shared \
-			--prefix="${EPREFIX}/usr" \
-			--libdir="${EPREFIX}/usr/$(get_libdir)" \
-			${uname:+--uname=${uname}} \
-			|| die
-		;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" \
-		econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-		sed \
-			-e 's|@prefix@|/usr|g' \
-			-e 's|@exec_prefix@|${prefix}|g' \
-			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@includedir@|${prefix}/include|g' \
-			-e 's|@VERSION@|'${PV}'|g' \
-			zlib.pc.in > zlib.pc || die
-		;;
-	*)
-		emake
-		;;
-	esac
-	use minizip && emake -C contrib/minizip
-}
-
-sed_macros() {
-	# clean up namespace a little #383179
-	# we do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		emake -f win32/Makefile.gcc install \
-			BINARY_PATH="${ED}/usr/bin" \
-			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-			INCLUDE_PATH="${ED}/usr/include" \
-			SHARED_MODE=1
-		# overwrites zlib.pc created from win32/Makefile.gcc #620136
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins zlib.pc
-		;;
-
-	*)
-		emake install DESTDIR="${D}" LDCONFIG=:
-		gen_usr_ldscript -a z
-		;;
-	esac
-	sed_macros "${ED}"/usr/include/*.h
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
-	fi
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
-}
-
-multilib_src_install_all() {
-	dodoc FAQ README ChangeLog doc/*.txt
-	use minizip && dodoc contrib/minizip/*.txt
-}
diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild
deleted file mode 100644
index a7d2cb8d2a9b..000000000000
--- a/sys-libs/zlib/zlib-1.2.11.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="https://zlib.net/${P}.tar.gz
-	http://www.gzip.org/zlib/${P}.tar.gz
-	http://www.zlib.net/current/beta/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="minizip static-libs"
-
-DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
-
-src_prepare() {
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		# uses preconfigured Makefile rather than configure script
-		multilib_copy_sources
-		;;
-	esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		;;
-	*)      # not an autoconf script, so can't use econf
-		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
-		echoit "${S}"/configure \
-			--shared \
-			--prefix="${EPREFIX}/usr" \
-			--libdir="${EPREFIX}/usr/$(get_libdir)" \
-			${uname:+--uname=${uname}} \
-			|| die
-		;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" \
-		econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-		sed \
-			-e 's|@prefix@|/usr|g' \
-			-e 's|@exec_prefix@|${prefix}|g' \
-			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@includedir@|${prefix}/include|g' \
-			-e 's|@VERSION@|'${PV}'|g' \
-			zlib.pc.in > zlib.pc || die
-		;;
-	*)
-		emake
-		;;
-	esac
-	use minizip && emake -C contrib/minizip
-}
-
-sed_macros() {
-	# clean up namespace a little #383179
-	# we do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-	*-mingw*|mingw*)
-		emake -f win32/Makefile.gcc install \
-			BINARY_PATH="${ED}/usr/bin" \
-			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-			INCLUDE_PATH="${ED}/usr/include" \
-			SHARED_MODE=1
-		# overwrites zlib.pc created from win32/Makefile.gcc #620136
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins zlib.pc
-		;;
-
-	*)
-		emake install DESTDIR="${D}" LDCONFIG=:
-		gen_usr_ldscript -a z
-		;;
-	esac
-	sed_macros "${ED}"/usr/include/*.h
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
-	fi
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
-}
-
-multilib_src_install_all() {
-	dodoc FAQ README ChangeLog doc/*.txt
-	use minizip && dodoc contrib/minizip/*.txt
-}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 71a2361a7c00..d85cbe11329d 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/jpeg/Manifest b/virtual/jpeg/Manifest
index 63e861990840..5025cec3fbc3 100644
--- a/virtual/jpeg/Manifest
+++ b/virtual/jpeg/Manifest
@@ -1,3 +1,3 @@
-EBUILD jpeg-0-r2.ebuild 657 BLAKE2B cf24e43e8992bd0a49dca2a7ea354ad92ec64932b916c2b514eed3fa5b5fee21763ac9ad076e88a2416bd6b974d7160fb5f6b919352b29c7ba8c4010e351da01 SHA512 9d0a7e5d208281c82957a7bb30e65c00c0c14c52590acf5586e90ba4ebc834b3b174d1c4af3b7a928d869268cb2a1cfb0af68f6db99cbfbe139a7817b9fded5e
+EBUILD jpeg-0-r3.ebuild 651 BLAKE2B bb68f3685deabc6a915895c646aa07ff3712daafdf7648426fd84167f99f54735da6b561e42e29e20c872d26b3dc9da317cb7758fd3517e0e4b14d0a4dee6824 SHA512 069dbb54d4c8c5c7c780918877cca90171fd8f1d323e70516aeb51447513b726f4696a557c036db39a84d17fecccf86c0c6d6ff1b88ff1483aa3625b1792e0b1
 EBUILD jpeg-62.ebuild 585 BLAKE2B 18d7c04e7692b03a28edc86dcfc49695bdc0c8f641e886a68fbac81478eeed3e092598605ae9e6796c9333524517221da7ac333685dddad0667d190d746f25d3 SHA512 7777609c4daf649eae0171557dfa1872f96ca34c67183553e5ea9744d8021d9eefd4295ced76bfa9b40a8c582235e0c5ac837423fb4f712a89028092bc067ca0
 MISC metadata.xml 478 BLAKE2B f06a20842644632f99e96760fd86828c19c43eb8eeebe63e3d33270ff0dbf2691a4308e6bc02287c986ccdfde72320bbab98b978cf33063f8f009dc6ae29dd64 SHA512 0caf26a58a2888bc999a1728c8cb06a913669913633afa381cf9777d44cc46a910d1fee9ff70228c84a1cecac2aa0146e9dce3a04f43697c6db42e8dcd348bc9
diff --git a/virtual/jpeg/jpeg-0-r2.ebuild b/virtual/jpeg/jpeg-0-r3.ebuild
similarity index 73%
rename from virtual/jpeg/jpeg-0-r2.ebuild
rename to virtual/jpeg/jpeg-0-r3.ebuild
index 8811bfb84df5..ee9a4e48562f 100644
--- a/virtual/jpeg/jpeg-0-r2.ebuild
+++ b/virtual/jpeg/jpeg-0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit multilib-build
 
@@ -11,6 +11,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="static-libs"
 
 RDEPEND="|| (
-		>=media-libs/libjpeg-turbo-1.3.0-r3:0[static-libs?,${MULTILIB_USEDEP}]
-		>=media-libs/jpeg-8d-r1:0[static-libs?,${MULTILIB_USEDEP}]
+		>=media-libs/libjpeg-turbo-1.5.3-r2:0[static-libs?,${MULTILIB_USEDEP}]
+		>=media-libs/jpeg-9c:0[static-libs?,${MULTILIB_USEDEP}]
 		)"
diff --git a/virtual/perl-Archive-Tar/Manifest b/virtual/perl-Archive-Tar/Manifest
index 0c5bcee211c9..5ab706e02fad 100644
--- a/virtual/perl-Archive-Tar/Manifest
+++ b/virtual/perl-Archive-Tar/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Archive-Tar-2.240.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Archive-Tar-2.300.0-r1.ebuild 572 BLAKE2B b1c76c9f34e82845097761fe303768b995a073cc0fbeb83663c093eaa6715036494d42132179c90c148525941302d94b6dab914957299a7058de6c237c972a3f SHA512 21086facba1fab5b05d68edf9c529fac5ed3c67ade40adc0f8b69a96b4b99c32ad9611320c491e0b9d077d2c11e1342ea35ac7cc33870fbcb006da6ba648e8ac
+EBUILD perl-Archive-Tar-2.300.0-r1.ebuild 571 BLAKE2B f49e7dd059cc010db70e894645f8c3799f8dbe4d56eab5f7576133f6295b65a7a48e70688c2cc4a70decd5bc09055ab3e945e685963879f8ca67d9d42b0b43c7 SHA512 e0382b201300aa5e472253947e82aca4b6c46b31d997ae7cb43e17ce4c2e9c2e8f2c2e3a53374fef67b1604511db3b5b94077bae120cbfcc82928b15b3f1f565
 EBUILD perl-Archive-Tar-2.40.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
index 7b97107f0e40..e9be4639f188 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.300.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2cbc4e49abec..d1085ee173bd 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index eb53b8160ff8..a05fb49fd677 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -8,6 +8,7 @@ DIST grafana-bin-6.0.2.tar.gz 56207202 BLAKE2B 805dde25c102c9ca6b1698c06a61d6b15
 DIST grafana-bin-6.1.0.tar.gz 56560533 BLAKE2B 4cd15ab713fecf46c554335ec520dce998a8a277e0cdb92d41bad08f8b8a58ac6ce48b6218bc56d39cdd43ef64113ed0725a12f7edec6ed35d6aff0c99477151 SHA512 a7528497cf09e3d00218a3205038377efb84d6d2d5a238067aed7a5ae34ef46051d29f0d35575e37d67f4681dd56136a91af28414f4f87aaba302301eabe0b04
 DIST grafana-bin-6.1.1.tar.gz 56562242 BLAKE2B 0917594ed5b219bf230bc043c5b0726d85de6764019cf2b2353293a13d5f1343071dff09f0741b32bd9973a6270ef57ba9dc14b08f74e745d1fa3330fe8d2040 SHA512 60b72f93242528808912083f75d9454d449f9371492492ced3c1ae87374fa5ae81d5c25a05abe793862b5b92f112f30a3e05c93fc73a14e6d93ba56129c9b991
 DIST grafana-bin-6.1.2.tar.gz 56563484 BLAKE2B bc04657c3ce40256b3840848c63a4d864a037733c94689ab6f26eb23fed977ee8926a0e14d2dd233cd94ec97f0ecc5075ce46275b4838234316721063fb6c295 SHA512 701df226db9550802dd72f482e3cb3ce6b753cb9769cea5acca961867adb6ac0cc0b7e161f727689f0a6bea6c872f11745a872eeca1302ce23abc5b02ab1c402
+DIST grafana-bin-6.1.3.tar.gz 56563318 BLAKE2B a2063e4308fe2d2b97e6f6aed80506d2ac39b4b0879d0c4a02a3e75e7d5c5fb8e0a03e9c3d09ee2e638ce3f85bb953f34b5808e4a0be1234a066f451d7f98eb8 SHA512 2d42f578780b37cf0fa31ab2f0f4ecec3c7960d9deae4e3de0543f4015446656746f9ac5f25534b8ee7063b539752df06864e28fd800ee1f12f5060fb5aa53e5
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-6.0.0-r1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.0.1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
@@ -15,4 +16,5 @@ EBUILD grafana-bin-6.0.2.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c1
 EBUILD grafana-bin-6.1.0.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.2.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.3.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.1.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.3.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.1.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	exeinto /usr/share/grafana/tools/phantomjs
+	doexe tools/phantomjs/phantomjs
+
+	insinto /usr/share/grafana/tools/phantomjs
+	doins tools/phantomjs/render.js
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 20db0e1d6c32..2609bd6e3fd3 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -96,4 +96,4 @@ EBUILD hugo-0.45.1.ebuild 5684 BLAKE2B eed2d5f3d069e4511a31119df191216dcefaefe0a
 EBUILD hugo-0.45.ebuild 5684 BLAKE2B d36f40703e38a82d5e190a5abc2f7c23a207e9d649c766a7c809c3c84a49085e04152e9cccb1a6efaefa58f396f7efd7afe509890944870dbb678c06bfc3e5f4 SHA512 d0495030323010154513d265eb8941ed956f282c96abcf72df084b0fe0c6e5097dd6ed12a3dc34f4024518d07c7e431c1762a485ff5cc483b882712139698659
 EBUILD hugo-0.46.ebuild 5684 BLAKE2B ca0fb858d24cd936fdba63bdd541bdd203e6304ab8bff5dae9863c690bacb8e71076f267f313b655d124a4be0795e09e7f2060a3024fe6f172a3af7610beccf1 SHA512 4e7ade7a40d7253dfe564251a095f648aad8b7388bd573a4008418362f82d0106be0f352ad25b7ec693857a1ebe45f7dfd4ac89fa06a3d8b55443104fc6fab94
 EBUILD hugo-0.48.ebuild 5684 BLAKE2B be7d61810d287494faee29df883322e0cbf2463d7a43ed6d9f1bd251cc07081207a996ec7e403658fa537ba4a37350df85b5be7b7361137086725c575dad22ac SHA512 b026bc55404246a7d371d0da072c9f72990bcbc5dd7a936af221cf88e4c5c7815dee03882875267a8c3b1ec211f29ef864afb9cd42d2bcf2485b3e7da9c33e5c
-MISC metadata.xml 312 BLAKE2B 461bb90ec180d1a09d780aee57523196d50b176b6bdd6645c75b878a72ecbe76f7e7a323d6c0ec300762e57be5ac4342c6f67a11f73088f55fb2b1bde17b5b25 SHA512 c7ab34fd5a378c5b82484b7637ab0fb598a64f61649d9b68726bc7cb9d5d51b7bd1f199f3f298d49dc7bbadfae9c3d692f45e878daa3e22ebfe4601b0d0f0c9f
+MISC metadata.xml 234 BLAKE2B ddbfdbd20d0bd2045f8b97d1d72165aceb073433979a8f8d2c9faef620751cf7d62e7714a72674ba87016a6e7264fa7f30d5c4e04491b378623431b07cd6f042 SHA512 2acec09a935e20d0e13c57d60e2d88456b522d3977a76b7b730232a58dc0d6f1152f348f5db56d8d3f2051a70baf40d35b643a34ecf9081adb328ccc6abdcacd
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index dc988c842339..f4cbc23a0c5d 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="sass">Enable SASS/SCSS support</flag>
 	</use>
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
new file mode 100644
index 000000000000..8aa18a0b6569
--- /dev/null
+++ b/www-apps/netbox/Manifest
@@ -0,0 +1,7 @@
+AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
+AUX netbox-2.5.10-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
+AUX netbox-rqworker.initd 370 BLAKE2B f80cfa9d1007f4f1a9add484b6cee5d0e07698658fbbf797b9bb479270104bcbb445127e628349338f1ec5e9c3a41dc3962c949b4759fd1b5b2d190c505149b6 SHA512 081236868f3666e2b689702fd1b7aa5c1727de67e97f0990d158ba00210e1b84f412b0882c8cbf6662c5999424dd79a210c06db00e531727319abdec5d5de227
+AUX netbox.initd 339 BLAKE2B fc5d0818a741c683125e1519312760dcfd415eb11e287d3087420f51041486654d4244619629b712054d0768c91285debfa01e46245196454a6b732262200a7f SHA512 578c708941c1d767fc58c471a383130005227123f24350073d4f4f33770e577dc53ad4c47964c023fbfb94ed2533b06012a60990cf7dad00b9495f791faf877d
+DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525
+EBUILD netbox-2.5.10.ebuild 3454 BLAKE2B 904ae9677b4226e0ee7d9df94249c702d49b7c4d97aacad2cd11a04adcacc52a450ea2c3ecb1de66ff0d67e052fe5299877cad8794f628f30b47ad00d6ad74cc SHA512 b132f15e1ed9cdb0de0f9ef813716df2ed69896e0bf4fec21e2f2180b3d8553894f7390b48ae207c4dd08a6bd4c0d8f25368590e0cf5650ea56adae02c439575
+MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/files/gunicorn_config.py b/www-apps/netbox/files/gunicorn_config.py
new file mode 100644
index 000000000000..4cb7111fac44
--- /dev/null
+++ b/www-apps/netbox/files/gunicorn_config.py
@@ -0,0 +1,5 @@
+command = '/usr/bin/gunicorn'
+pythonpath = '/opt/netbox/netbox'
+bind = '127.0.0.1:8001'
+workers = 3
+user = 'netbox'
diff --git a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
new file mode 100644
index 000000000000..5d1fa595f4e6
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-rqworker.initd b/www-apps/netbox/files/netbox-rqworker.initd
new file mode 100644
index 000000000000..2973e471e038
--- /dev/null
+++ b/www-apps/netbox/files/netbox-rqworker.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+name="netbox-rqworker daemon"
+description="nnetbox-rqworker daemon"
+command=/usr/bin/python3
+command_args="/opt/netbox/netbox/manage.py rqworker"
+command_user=netbox:netbox
+directory=/opt/netbox/netbox
+supervisor=supervise-daemon
diff --git a/www-apps/netbox/files/netbox.initd b/www-apps/netbox/files/netbox.initd
new file mode 100644
index 000000000000..d0457a8372f2
--- /dev/null
+++ b/www-apps/netbox/files/netbox.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+description="netbox daemon"
+command=/usr/bin/gunicorn
+command_args="-c /etc/netbox/gunicorn_config.py netbox.wsgi"
+command_user=netbox:netbox
+directory=/opt/netbox/netbox
+supervisor=supervise-daemon
diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
new file mode 100644
index 000000000000..f53806a22836
--- /dev/null
+++ b/www-apps/netbox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+		<use>
+					<flag name="webhooks">Enable webhooks via django-rq</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/netbox/netbox-2.5.10.ebuild b/www-apps/netbox/netbox-2.5.10.ebuild
new file mode 100644
index 000000000000..efa1ca65e925
--- /dev/null
+++ b/www-apps/netbox/netbox-2.5.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=dev-python/django-2.1.5[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( dev-python/django-rq )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete.
+
+If this is a new installation, please follow these instructions:
+
+From the installation instructions [1], you need to configure postgres
+ldap and webhooks if you want to use them.  Then, you need to
+configure and install a web server. Gunicorn is already installed, so
+skip that step.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+	to the default runlevel and start it.
+
+The files you need to edit are located in /etc/netbox, not /opt/netbox,
+as shown in the installation instructions.
+
+If this is an upgrade, you just need to stop the netbox service,
+	run the /opt/netbox/upgrade.sh script, check for new configuration
+	options in the installation documentation [1] then restart the
+	service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /opt/${PN} ${PN}
+}
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index 24c347fd8452..18e6e42ffab1 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,3 +1,5 @@
 DIST piwigo-2.9.4.zip 7846445 BLAKE2B 8c8eb7ab0e153ad9665ab3b18b70f5090b2d6545b312b19fcbca6f80b3e017b16bf94271ae071e02c2b8978802adb4e69a287a4e6dedaa728a41d6479765fc57 SHA512 b558700f041402f1fa399d1599ceaca4bb381ba818f189b5dca68a5b09d65416b5cbf2c4f48c8390381cffe98c840d4279c0b57c698ca5a81c0304ecc4a9a80c
+DIST piwigo-2.9.5.zip 7870527 BLAKE2B 6a61f97125d3594d1672d3e9dec29716dff62417c07f0803c576c2cd9636273425342791e97abd7abc8f50dac56ebc4b7843435d75cbb3fd8c29e9723f9a32c7 SHA512 d211a86b40f3a20f406a4bbce87c094bc155b664fe7fb5ec5ab4de6e0bb0228c0c0aa30a04437469ea2360bc72b9e76b265b2811d77aad857fd85eeccb4d30c2
 EBUILD piwigo-2.9.4.ebuild 1124 BLAKE2B a76eab874b4da2523c2fa640c1328cb62face4558ff3b56963be5ecc1e0474b83d7c29f30b8ef20c1d6a4c0442351a4f3385a01d730870f971c3e6b8dd8e9df5 SHA512 d563490c915c81bb820bf91bfc328f98becdd839279e9b780a29555ebb5a27858abb08f2c635ab42e216c666871c8c8e8e04cb116ae30055d67777bad46f3193
+EBUILD piwigo-2.9.5.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-2.9.5.ebuild b/www-apps/piwigo/piwigo-2.9.5.ebuild
new file mode 100644
index 000000000000..56866abb3045
--- /dev/null
+++ b/www-apps/piwigo/piwigo-2.9.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 74da36b15640..ea38eac5e291 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3ffe7010c77a..6839cd90235e 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -191,99 +191,99 @@ DIST firefox-60.6.1esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c403
 DIST firefox-60.6.1esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
 DIST firefox-60.6.1esr.source.tar.xz 269197532 BLAKE2B 1c108366aa5a6a2994ef8dd70dd70da79ca54cc5a619243ff304ba87450ca261c203cf67f426ccaa2bf6d1be35bcb71e5a2ce9859c8f227ad48b83ed5895897b SHA512 a1683e9ad551c2aa6b84013216393fe1f7107728c253ed8e5700d419cf0956513110ed4e1b5dbac3e3bc23930e3024706f1b24d405b6edcdf8c175b03ab241ed
 DIST firefox-66.0-patches-09.tar.xz 149336 BLAKE2B e423ce6c607c350b193fb88f0dc00f7c7996b4979ec2ac3e049e9ceabfdc558e704508f6f5c688a3733d4dee5bd7eb9c744bc98637ee45cc53ac37f8f82cb0a8 SHA512 9b760ee99a6d36de1c2e5ba4a87e2982ce1934f8f1ccc4212cb9f308ad16b7d5865958d0ab153fdecaf3c223543c0a6aac69313dd73cbc7d7dedab77254fcbfa
-DIST firefox-66.0.2-ach.xpi 454633 BLAKE2B d7fd11a71f5a18a3a43807815e572c0dec7d2e0212da7d17f873f578efdc84a969073f0bb4e98fcc705e5d8224e97b242da1f468f9f550b3e916ae70a4ad7711 SHA512 3f2a1818114229f508167881d15f136269237e68e3a6a85c8cd24a598c3746c97de1497377634d609971e30c4233873f77781d5ac948efd06285fc37844a0e3d
-DIST firefox-66.0.2-af.xpi 447411 BLAKE2B 52ef0aaa5d9026c3bbf8def6cb59a911d0e35899a8115e633b13efad893c49e77f66eb8a08c1bc0cdbf5e224580c67389970e98ef0995f7b0c78736a0db47702 SHA512 cad147a60eb764d091e416750cfef00a7b0de56e10bdcd823dba45317459c24a36f1c2db31c3c0ca726041ba33f230f4cd3182e2aa9dd770fa2377cdbb6e431f
-DIST firefox-66.0.2-an.xpi 472354 BLAKE2B ad7886303ecf83de539d7f39ceace3e58675fd8c9f9e5d27a19444088b09d8141e42b87a646b032e0c77892492fc677f857205d0bf36f444637b2ce5c0ca0bcf SHA512 6c2875e31d772ea0f10f06e89151e6ca6ab19dd8a9b6e92df7d5b967e55a18f3268c7318f123f7eb06843093152b6e1ce3e3110159bdd4302b505027c70d3ddb
-DIST firefox-66.0.2-ar.xpi 516884 BLAKE2B bec8e15f84fbb8307b5a80d42ad078c6d709442e85434cc66a5b7b0f3e8376583960f1e5f16cf7a944d4cae0659d04db974229492146ebc4d51726a899a448ce SHA512 96e436675371293f653013f1452005c09c3278d9be3f4692e9caec44dc68c5b8b627f2a55e4327c0a3cbb4253f6a5d4f25f1f6cff215d2859c091c8ff7b6ae05
-DIST firefox-66.0.2-as.xpi 479966 BLAKE2B a3bbe24ee59e437fbf1a88fb7c6155575b38892c5d34f98de80b23f496a6098e23b2b8f1e0d6305636ce1423910b4c73c3a8f9f5618ac68fa790927b2d051a30 SHA512 bfca35582e9332d24aae0d99457ba37fbfa5b4228d2c29cfff1ae074efc2bc4d9aa07f4d20a4bb2f41cf32b5c0259bb16a3ebd574ad49b75d5f952a836dae1dc
-DIST firefox-66.0.2-ast.xpi 471757 BLAKE2B 4a17d36cca666113ed9410c1a4f71e390ca587abefc4d90974c8cee279af7d23803f30e00e15e0a23afd3e2284ed212d8d9ebaf3bc41f160724ab19b709caa91 SHA512 5f0236f1ff16d72d790ae2c017991e26c6048917a7a3435e6d99cd95dc5ea736fbd44cd498a3fd5066ed3695846b2e5e760177a7aafe6c9c2f111944d2dcd950
-DIST firefox-66.0.2-az.xpi 494089 BLAKE2B 78824fb0217fd874ac89c79a24601554262d195b290c2b79d6211337cfa407040367757b935d6127dff905a00d86afb7ca2e4eae0741972ef181cf1ca843a1e3 SHA512 d8b52746555baa01b3c4f61546250aeca162170905e4f89a08d6ecbb82f4437760d34176cf6f5c0960b898149fdba2fe6497331e28e960d668116d3702e7b9ab
-DIST firefox-66.0.2-bg.xpi 527812 BLAKE2B 58b5193ff291f7315aacd394575959e2b3340b6bf975834982c81794f0481cfa9bf715dc013364c3b5ce1711707558d56aee670394e30d365d932d441069dc96 SHA512 436c0051fa5f029a3901edb48b600703054eef35e29e06ebfb053e9b8970d9ebcd3c165a9e0b51fbe07ec85eba66e8e3c1eb6712254fec13bc313620c47ccc11
-DIST firefox-66.0.2-bn-BD.xpi 547084 BLAKE2B 0ca3a47f91018e848f325b4790c4c0402e3383fd52f51b66c4ccbab4b308c1370f9c30762e3ef0231913301f7a9fbcc369daf31229eeb763a356cbbe2933cd2c SHA512 6b5c7b5429b7106d9e08281e4587f5070ce2ecc35577be11f3bd5efd5d5092024897c28f29b7a6d47291ea01228b378b9f077131f3c83ab9cfb1a0860436f056
-DIST firefox-66.0.2-bn-IN.xpi 537453 BLAKE2B e280d39a0e03edcd8dcd1348eb8faba7f2a4b22dad3dd46000b5770a2f1b3f0ff2f31600ba45476be8bce489142e7812e1e2dc8bac7ca2354a93b80b8b578521 SHA512 95eebafda87e13300c24f13d92aeedac9f9e2cc8ea5d4a59e15194d360ae1d560ccb653d0c3e89938876ec14028de03fd14c3e25ad545dbdf162e67a2c84c67d
-DIST firefox-66.0.2-br.xpi 476663 BLAKE2B e91ead5af4e79231902688dd4bf28a00bb9b1c0ca765da7e7162792979329265d95caf59500b4ea140ba3bcb5b8dcd5b3ddfdd36af4d3a42cb9a02538169b96b SHA512 b6d74bd3d63fbd263e2c5492aaa2f43883af3d05ae527e9291890c08e344aa4bfc45d43568b350f13179be40dc32a14588b3e53662d7bf4785673c5da302ac19
-DIST firefox-66.0.2-bs.xpi 469381 BLAKE2B 8ef61c5fe9a5fca32691f66330af4d25dc642c830f48b2f0d36afbff6d1aa395b0b398ba5ef554b3a19d0bc28f3100afadb963e6b1a2e09c527b2aee246a09a3 SHA512 d78d46ff9d669afae28ec05569729f5a766faa0f8e97b21ab682900638a400c0c6bb62b053c8d286e498379f6213b9619cae35fddb3d7b87bd8157593e6a77dc
-DIST firefox-66.0.2-ca.xpi 477762 BLAKE2B c475264788cea0dbfd5328d8961c38bca11ca79a765361733f8a9ebd17a954711041d5470b528fe97fdb8d5107f0256f2678ee054fffea91cac05af52279c064 SHA512 1ebc954919a243d568b42484242a2da1731e964507d954c524452a6e46521b025c4387beb8d43423149b5b15775231b0c8fc54a502e3e7dcdac2e2c9f1cc53fd
-DIST firefox-66.0.2-cak.xpi 500365 BLAKE2B f9400cc7619fd9785f7f378188b5d70457299835539e054067e777e31fcfd1cc8727b229aa750565fbb564e33875785f10737348abca95bc288cbd0e39ab3c9e SHA512 599c4b1275cd7d84817495b33a93068ae8cc36da165d509a9c5f2340b6f60a8ff042607354524174857acdbea8f489cc5f16578c1fabbd47e4ec6c9da87cd684
-DIST firefox-66.0.2-cs.xpi 490115 BLAKE2B a3aaace218c2c0937dacf06e01ac2543a363011b0b969f76193fde506ad7dd6ef78b2f8d5866873814f6a5d9547a801c54e5a3acdeb70163c5b6cfef9f736d0a SHA512 95f53866aed6d1b4112c8371e6c1ce31c97b1fc4a020ee6408ea05dc3d25ee661f2e20b973d160c06f7124b733bdabc3ea49c77a245266db95bfda86b59b9c60
-DIST firefox-66.0.2-cy.xpi 479451 BLAKE2B 55fe3a435d967ddea13cd008b3a044611e2415fc98247ae9d765ac9063115cd9fdb21dad579a89661572bf6c3b7809421a3b9f870cc00299e04cd2d45c4008b1 SHA512 c188a1b20fa8b70684f8994d311c2bd848dc114a94e685d4afdc84d92a64c692b88b09036e58dafb3be196bc3a6451a92bebaf935b30db8ac2cd9e2a2b2300ce
-DIST firefox-66.0.2-da.xpi 489560 BLAKE2B 63ecc4978ccc86497499e9d32ef8fe0839ed0682e5518c6365501372a6ee9147864da62eb3006b5a32df74d01529c7ec246281bd93a37531b34e33a02ca5ac06 SHA512 d26f8818276430edf9991884330f425756621b921f0df5f744cd3921f50d288d3c09586a83ce51c226a32a61c078861d169e44912efe6347e365f38625433ea7
-DIST firefox-66.0.2-de.xpi 488906 BLAKE2B cb898d4737ee77adbe2f33b8a0e84c4f004d2c233a9c9b9c473f98759dc353da8972bd9fd1cd426afcfe77688a56c125c09ef08e55766fc57982210df12c8d9c SHA512 1a76ff9c4af123e33df80568a72df0d843c72a2b383090ff0684d33cca73c7d3266f7366e639e2372272cc6fe6523acc25214f5d05fe16c91dd73c0770eba8d5
-DIST firefox-66.0.2-dsb.xpi 499056 BLAKE2B 7bfd4e267566d675e648015961708e00fd696c15da7241b64e48d5d47c31fd28c89fbb30c51ea00675eaea6bb2c204fb94353fb0e3584abf813aa62404023f2d SHA512 8300ab0ad4bd9d454deff94d40b19065870cfda36011c46f40888c88ce5621975250a8f624bb88741ea54f1d3bba5f8338b67a83cee483c30c2279e38cc95a57
-DIST firefox-66.0.2-el.xpi 553955 BLAKE2B 3b2e481ac849938ae6cb49f5ff8870081686327070c3be665d67351c743635561f5b9d641581792da3670bae60e6c69281dd22f0bca1c0f5085d1a0b50a0a19a SHA512 f6b87fae21e2c3fdc035fb42212159014e53afd275f26df91c3bcac1dd44e70ce481d3b1dfedc68480844f88d26af103133a73509845d3a0b6d71ee2dd41abcb
-DIST firefox-66.0.2-en-GB.xpi 451500 BLAKE2B e9fd1a093a7e1a96603605b37c8fa708676476974de38b2b870f1bc5914297809812ab760329be643687f76c36246394e9351189da1244534595a115875690c7 SHA512 8ad2973f4a098a8fceb8412afe8e55b7438e08efa05044feafaf071feca29f4f83fecca336bb196dd6b768e2840418c5248d10974acd5397ef0e9c51d1ebe496
-DIST firefox-66.0.2-en-ZA.xpi 430518 BLAKE2B 8765a84b2ed3234c1a180772741517c974e00ace88ca8395b9838afc2f912e99e3b37a4a1b24a6f55d2e4630f631a4999d6a967f497080c0fda6163c87b27818 SHA512 9a7226f03f0ee7237181fdf15a0086ace7e79722fd930e4cde91be1748668603ef996fc8d226c26b1d0571024c860d635dde3e686e25c106f9b9638ad3cca736
-DIST firefox-66.0.2-eo.xpi 477849 BLAKE2B 67baca0dfa6a55566d5252caefc97e1573724cd27395a107834db75265646e21351cab8c28a292701076ff23e4d153c8ec27ea07c068d276bcb2cba1de02a3f4 SHA512 14ab014af25e0abf5e0b2ba67b9137fdf332263450910b1472b6355f4daca621ac994e0b81b7508ce77b260be702b10f3cd2c446dd97fa80b29d4c281ac6e25b
-DIST firefox-66.0.2-es-AR.xpi 486158 BLAKE2B 49cddd9db4c1a041002228c7eaf1a82c87ddfda8296ceefb00906c325763e5edda20d55da35f25a215247278d12b79bd461f826c71bc70c556f2f3a65ed9186c SHA512 547b62263451ca3c82944949f3e9e182048ef215fd846995c427729c45a72260fa5702a57f50ae84f4fe4d85516539519cf0634e67ead481476834bdf384fb81
-DIST firefox-66.0.2-es-CL.xpi 482899 BLAKE2B c36aa228a57b47a86e8f6ecbd2f29d8a7ffcf6768b5e82372d24d2850c847557bfd72695a05d6477956a9fb2c89dd412f2310559a0e67b9c38df3bd0e658c96d SHA512 6d239a4d50fc6a504cf61f5e7419abc73b08d5108c96b4ca4d2952d8bb129c0b3741fb0892b9e5c21c6bb8238eeebc3c9248c65daf500333bc9d70c8c6add421
-DIST firefox-66.0.2-es-ES.xpi 446826 BLAKE2B da8409be8377b93126cbb94418f032b5bd07d81201600493f8c098533bfd9b98a6adfd1f5759698a5585cc3ab1d661fbc982eb81a0d20e98ff9cb9dfd430bb25 SHA512 c0811a80f01f310a393b49a7aa324a6b1d3c688f54c359b76c9b007e20a55f4a25aad6192415523e7cbe9431e8013430bfdf091cff69f97660d416c3782f5008
-DIST firefox-66.0.2-es-MX.xpi 487854 BLAKE2B 698a658054d81955498b5f9a4526be43ffe0d8c51ce37aade76ea35681a0c0c72b90549f416cc80f9649506f040477c159491393e48218c598af270c80df946d SHA512 3fd10578b0af3242c25786c2118df2c6d34ffcd46aa8a8302553adb9563b1511b20543dd1414511acafd4dcd7b2ac55ae4cd4b8279b9a77bd7bdbe482c5a859e
-DIST firefox-66.0.2-et.xpi 468374 BLAKE2B 5b3fb18c6e6af1ec17a94b6541840ece466af1080301a71e09cf976df664e10236c6d50b7e4dd2d5b0be20250a069a51faceb4c13f0fee6af720a26ecd483b0a SHA512 48f7fa7779a68394fa7886fae5826d139ff33a6ca7725ee284f070e4e9ebf4a37e607b777e0611acbaa1afdd516b15e1cba2125d803ad79546b4f526fc807e8b
-DIST firefox-66.0.2-eu.xpi 476874 BLAKE2B aa644aa5f5fb247047472b3a2033206b05e77b597ff3a035fd7d7dc0add98c740c7f5135970df2d16c9f493a206589fa07ecf9928ce84d0af50067820d4c7a4c SHA512 c1d7a63a3ba0d6a585eb4a8d7fb618c2d62824ddb678986778c48a5cf1e827bff624a53f04b032da9e49d635dd9bf7e9b7bd3955ba37edfa630d88464bbb753d
-DIST firefox-66.0.2-fa.xpi 528479 BLAKE2B 1e3a2a1526afea757122de41e68992fedd20193df4011b33d956f068523dcb1443ec66ca14ac6abf27a4060bf4f15a80dc27637cb790c56964dee3f8b32b7814 SHA512 ca82dd71d29e1a39d8ed49836b4abb1378c81d910ec69680bb209d5a1df9b85a915db26e93070325fda2d8491fd71ec52f98af13714cc340bc57635738e13169
-DIST firefox-66.0.2-ff.xpi 471591 BLAKE2B 339bd96963945d94fa2210f93e98f7807f714cef771f232f3cbe11a3be68839f7c1e4e46393b136429f9cbe6593df7ddec9642fa66ea79926493b3db13eb7aed SHA512 a1fc2ee8e5a366baa8db1ce9ce62dd0c285a53072f9a3bbf2742f4d0349cf6c8dd0fedd706821f0836c4d14daa92d8e899b65ca5b0b369d3af89f7dad68c2267
-DIST firefox-66.0.2-fi.xpi 466498 BLAKE2B c8c73aeaf478048af542186b02bb486b96de150933c67b107748d04775459c19e6b50c1bd80d09a367facf27ed7eed496a14860d7d1f7aeffe67d9085c1b3770 SHA512 9ffe2fabd2431dde92a6b3ff4be7f4e4157e7077a3ec27b8da5a79de0f990de6a8b9b250fad23129c56bfaee00cd6b58a825ebcdf357478a389c8346992b1f96
-DIST firefox-66.0.2-fr.xpi 492350 BLAKE2B 9c6096d30b8c13ac8a3b9724fd5822d005f7bab588d9ff8c998d3f212a0deef19500ae20316c535749313a97b395332d63e1e23f4fb18ba6f518a2d566f28e6e SHA512 81cbe5b46769ebff8892fb6fd843b638289bf2c060f539de3f90abac93a02b62ea95aa86519d711cc7e997b6f33bb26af19ffe6bd4b2f30462f4b9af4b9f90d6
-DIST firefox-66.0.2-fy-NL.xpi 483164 BLAKE2B bd42cd09bbf7c1aebb3f06dbba2533458265dda6ab693d8e3dbde517b70924506500183b949d7e073caa7fd5973a32e51340622ba2a33cf2df99517e3789a484 SHA512 cdd23079cd5be050802cd347e6d77ec07a0c6a3a5f126ef511a5690e98b0d0eedd0e616d7edb275db2acd8b46d915044ea3d439fb539e11d451af0e70d398a7f
-DIST firefox-66.0.2-ga-IE.xpi 476917 BLAKE2B 0137b099811c20e5c85597d52169244f78d17ce5066fbd7e1a7d59c03fb02ede44357e23cc245801e7dd2e61c1fa22f0d020c8188cce29ea81c390187c576030 SHA512 ec02a9d6778ff7f1b9cf9d816eb94b87aa3e747b485af147e2d6abe0e5f35bd6f7108b85bc19329214b0259d4e38323d115c92d303706e2cb4b73294fd01e08e
-DIST firefox-66.0.2-gd.xpi 486095 BLAKE2B 19a052dfd67b5fbf1f3251d2b04c310e4455080d5a38218899a7160fa3ab723bd59a4e6adc375cad6f39fe043aea07f96135f682d95d9f4492fa943e3939d9a1 SHA512 11446cacffa320c950bc41fa1f3e6846e552ca3a30c57d7769393cf7466c0f02eecc473aaedecc4f23c5ac5c12d3134dc60096ca1d816d371e26cde8f8218e83
-DIST firefox-66.0.2-gl.xpi 470770 BLAKE2B 91f0e4eadda9f8aef31013982d93b1ef92bae20dd8fdbfc4b8a4a281e24727f8d745d4d541caf79d83b0624f79122160ed72a59c48317aae81ac2ff1945b8c28 SHA512 165da83aaef7e1201295869c25e4c33b630e52364af9cf93d8e0a728184d42714b41989ed3985b5229e0abd84a96c80ea7d6051b384e0c74143ca0804beb3e7b
-DIST firefox-66.0.2-gn.xpi 492854 BLAKE2B de8760a39c95d2bfc1562b6b6979f7d4ff24426909aee9164f91b0b0c5bd0f8a335e336c84cb3a4d97768cf757fbae3745544ba500c08bd8125767dad1ce1e7b SHA512 8baa417cd424809eb560540d3a1d0d9d79455f7455d8739af8c0206c34c49446459d85450e56bbd391efb6e485260dddd87aa3405bd7de0ebb9cb3722f787941
-DIST firefox-66.0.2-gu-IN.xpi 552732 BLAKE2B 3b88e3495c5424efd233d1273c7126cdca16eb38bddaa8151d8e14336ea0c0844210e08170a54174f9db3ec25f9ebf03ee4351c3b3ef3fa083515749b7467604 SHA512 24120007584b1cea0f483aaa1b780b3cce295f88d169ac4ce4e29436dad9bd93a995cfe00bdb47fae614fbf64301073bc60e5c86a8425943da82d74c67c01feb
-DIST firefox-66.0.2-he.xpi 491408 BLAKE2B f843e5f9693cc10fdda4042402ab3dd2e3f5d17a474e5104a4fe4445cdbf839729e69054fc033db09795cb0e4f89e8a947c9c7daac820dbace69900fc8e7beda SHA512 bf294daa36fd81522a26a3fcd87766ec2ac497477b507c04bc609068491e3e5dbb74304304d813e82a18a5c3d6f867cd15f93b1464c4a875ce9b7b08312e3e1c
-DIST firefox-66.0.2-hi-IN.xpi 538522 BLAKE2B 598148bfee005082b65cf9d83fd8d4d1ecea8ef1468878440a552cc87d35bfc899e50b0508b755a4707833f259efbb5bd05cd41a59a52ed72a9628bb321a92e9 SHA512 f0cd9af893e942aab05417de1e522902772f8f7dbd7e800961018003f124f360d1410bc76487fcf1c9296fdced77fb2694072149f2f046a41fcee86b68943a1c
-DIST firefox-66.0.2-hr.xpi 475791 BLAKE2B b1a03a6f47264fabc4408dd590a5ca043851a9a7009842e34cf90639d44fb49e828235dc84105ff041c1746a6741bcadf4085752d934beba738270257e67a4b2 SHA512 7ac7c4233d9175308688c34b73e017f2f61876ba1015f812fd232302f869df314601f414467e197852526dbf84626ac06ace81feecd5afd589caa2cd32118a2e
-DIST firefox-66.0.2-hsb.xpi 498556 BLAKE2B 7382b6957d45fe8fe349e00a85045dcd62985d5ba97b0acc4ba3a8ca00e96ccbad4a9bd4bf15a7ff2af5b15a6469ec89447b798336fe596b1a26af59e41da7b6 SHA512 5582eac3d744c27cc88ac80f0463822c7605a130e7811efdac0fd72ab7bf51b1133dd1ded9df49995af1b1d7b89895e72f761fbf2bcfdaac88a0dbfc66305ac3
-DIST firefox-66.0.2-hu.xpi 495668 BLAKE2B 9718736dbdf8e37717b101604a2acdb5eecaadcef902d969e691799d3d1f328f9892409cb1233d596c337756b9fcef9cb5aa254126a4d15ba7417875facaa778 SHA512 1080a440bc0b6decbe56ec38efd2b2e2d28740095e6ac35984270a59c82725f91d156517877d3151c0acd8831293766286d4d4eaaf042abf1ef23686940ae3fc
-DIST firefox-66.0.2-hy-AM.xpi 520697 BLAKE2B 879464b2f039d5e6f68eb45e0ccba11f76189c9abc71b39b77667883e86c6f9ebaf4fab0a44c9bb9ef3f0e7e72a585268217bea0a93867f9b03fae8cc3c25d01 SHA512 4f0d52476c7dba98db62ef176c42aea11e9774db3efa690d9f3d6f9968ba5724ef535ad1405d9d6235b16e2d6e66e3b8d078dd6188d3b0f1bdb1e31faf7bacec
-DIST firefox-66.0.2-id.xpi 465881 BLAKE2B bb41765cb6e03756c1f902d948ee6b5ac99bc5b1dc5809a21358264b8ce4ef5fe2a1a4e058b98f7e40ce2e82409dc6f67367422178ad35eedab0b0f1c1bd1508 SHA512 c1c8f23189cac8739a9f9863c73b514f644df3daf82cb2fc237512538977094a98e19a3bbb96394f88a3fcc602a8213234eaea14f4ca3d45ae4b899ecd9578c6
-DIST firefox-66.0.2-is.xpi 477148 BLAKE2B b534fa786f4412450506c09a3f1a6f5ddab16aef56a7f77b2bd9cdf1eb281956bfbbb107338d482ff96d40607dd35af979dfc7fa4307aee8f1734a70107d02ac SHA512 42caa04f51ef1028369af05941ae2509792f0367dec2735547d0a6ada54c6b02d135e41a79a4d0614bc2407b24e4dacd97f295e5ce47d95a74f7f9b76771366a
-DIST firefox-66.0.2-it.xpi 365177 BLAKE2B f2aa39a824303af770c8c95d04f230dd11969ec59cd67a2478c1c99f94bc2c3348e230b4a62f84d2ca11d9a7a047e68c632c13b462bc391c01f50e861ee3fe78 SHA512 fc0a1de4e37efa8ed4e3856a2181d9178c18d51f33368695e770fc2115d7d4247420479786aa7094f41012e732afeb30c4f8869dd2a3ae9a4ff088d2af026f6c
-DIST firefox-66.0.2-ja.xpi 506351 BLAKE2B 65deeff7c99b251c59d31555d96011ff2ee2efd54f214d66c2367b53c39ded8f6f4086a769f78b4aad1b25ac8e1cec7524af02e2d7dc1183b0ed8d7d2a0bc453 SHA512 c4babdba1e457eb05c1ed9a1ace06523aa636c0928de0cb3783ba7857dc2b6b951efde82336f1028c1a3cff594f723f7e13ba3e987c7bbd9314f14ae220495a5
-DIST firefox-66.0.2-ka.xpi 517442 BLAKE2B 44cdf35e751cfae6c95cc87bf9fb4495ea3f3bddce8083e1bd0001777745baf179ab2d6c4f758592792b359e636ab1ad344636000ac644e564c37f6fa609ce4e SHA512 deb60c4624359848bf5c189499ddc1e04edfebe611515409c92701dcc6421de10b2dba98c834314d32026159f28efe4727448cbe3dbb3b2ea2c4e3a4123a7efe
-DIST firefox-66.0.2-kab.xpi 488668 BLAKE2B e91ae2abc355a1a6ed7803d2712f4634b165ae7fca2d31c9dbd046f3d8b2d1d1a715be95b5c5250676367c8771dd8f2604413b36c0bd3a5b187b19460918406a SHA512 0cde9c82de0acba133a5ef6c02c91ea5905a743cb51635c3ba1a111ee823c313d077c00bdc6f8e8fed08ad5499a9b3cc5787c27b59f580bf51fa8c1f81fb7c29
-DIST firefox-66.0.2-kk.xpi 543754 BLAKE2B dd7537159c5ea5ad51bb907d98320a012937f8389e10cc02af46fd940c675436710cc622ea1766407070dde14dc3288822b8fe636ec0ea89ef43b2afaac402ef SHA512 4cdb3ca000cf141c61f288ab21a89c69fa0f4ef8efb326a2805a620cab69752870ce74da8962cd64e91f6c533fdd0abba4e2c0d5786462f7bc94c71f752aed08
-DIST firefox-66.0.2-km.xpi 534613 BLAKE2B 1b06fc5a9ce5e5bcfb78226ba34856a32c9bccb8e86dbbc5f0061877798667d91f9d5e7c32c09339f3b74a4d235fc58a587a77b50c5bee1df8ee0e1a2f399eca SHA512 e73aba3178f1d0208c54c5c646a6da805cb5453ab792baae3d9d426e29ab5883d95fb5cc7da86d5c0b3e680046e35cba4162c2747ccf828d0bfbb137630d9d87
-DIST firefox-66.0.2-kn.xpi 534280 BLAKE2B 52a81207f0e38c20770c538585f04fcf74b5b2f8cc1635b700bef2205802e1ebede5c6c6ae998aa2303e6b1d5dfb04887c2ddeeea343078ecc04814c74d62674 SHA512 98218e52c0487422c9352280c2e71b371e8d76bd82ed5f07fb495b9752b989bff3489e504e83b1c9de403c90cc93f5b65b91c6394bfd0aabe74c5844058ec98a
-DIST firefox-66.0.2-ko.xpi 499373 BLAKE2B 76064c4c091a559c9b4c3e25d52d6bc62ea7187444f1ec1d99f27e678dc41cd32616a61f892516aed3c02db646da5b8078e5363fc906c314f8d886d7ef2d5e78 SHA512 0b4dce294c6c522350b07610f3aad7afc83addff2510cc9041d61973951e55b59b1a8e1d4a753b9e3ddfa452ed282e5b472e58ba726df89a059b38c0599e8c7b
-DIST firefox-66.0.2-lij.xpi 472485 BLAKE2B 713c9cc701c9e432dbc3193170ecf204b7546f229ea96be59322fedc84509985262e74b8e70036dc59674fc022d9971843c97fa5c707074eba04bddec96346bf SHA512 6e238708f5d9a79b032170e4f815dd755a04f5711d73fd638a10cccdd452b30a2e890230781c64fb1c1d9e374325f72b06a60fed05795ae53269a76768de9467
-DIST firefox-66.0.2-lt.xpi 498667 BLAKE2B ffab8a79895f594c24f006b7bafae360a8103b7abd4ebf980ab319c30b54a69580f6e915ca21d8b99240e411cd118bdceaab76ed974046ee00902bf41d6ed235 SHA512 c4ee010a3d73036b289240d01c7ca00165f1611f62aea1f911aa38c3492c9b4887d5ad37a936db09673b6e7c75be8d774bcfd8946fd995b21d39d0580a652729
-DIST firefox-66.0.2-lv.xpi 487174 BLAKE2B 85860c8e65fd05297ed18c37ebfe7903a39bf155271a60d9aa81666d518f2f10aa63779858ca0d8bc08d636b9ad48905deb0a4b6d86fae07bb4c59c2f1684656 SHA512 4734fc1fb3db1b6edf58311fb2143ff9011d9acd6dc0d7e0c1924769e3a0c54c1e6bdbaa9b589472314ed33ea9f9aef9aa35b4a1b38b8da26e15cff090c9a590
-DIST firefox-66.0.2-mai.xpi 496839 BLAKE2B f12f442db0346258273a98f05d784baa582d86ce65a0108f4be4bde682f58b162feb0b5458dac613c531febdddf99648d03586973a66dc0a293e412416637fbb SHA512 030882beea7977ed73b750ad44b7349ef9ab2d6db5410b0b7727486745c0ad7a7c36067b58694c5eab4dd8a196c64909f09c2dd7946407991bf6f09d80c17f86
-DIST firefox-66.0.2-mk.xpi 474275 BLAKE2B bfe14559948b25ff865f663b28b7d14307dade34ad131b2569620cc3846889500340809caa7063d6ab7604f88d083c7d536b0967c5524583b867e86267271e42 SHA512 cacaf3c940048c2dfc923ef9c5302ee4a15dad3f01e686c21fad22eec6970111f4facf93bba82098e3a265d388baa4c643daa1263f1c64f5b73fa5406fa1d3a5
-DIST firefox-66.0.2-ml.xpi 542468 BLAKE2B 339575f69f2d60a10b2060201527b394c223e9ae2706718ae3557268b694c3008a71ab9090fcd9a4d61b7125706a710ea0b9628d882214c1d1d7854b6289f76b SHA512 b477a22f252a6dd61af6c1a1ba2693c730b59698e07a3133e5472e2c30f7e49e3e6f4f7faf1656b5677ec412aa016c1ab52adcd9860457f0f80f6dd6ec436b9f
-DIST firefox-66.0.2-mr.xpi 533900 BLAKE2B decb01de6a71b81ef081f134516eaa7c7f62ba653b1f12823410ccef615323108b898a8faba4b16d14a6fc9f8cdb486c1174f1ed557309685510520f1444e7c4 SHA512 e4bf90d152ab489eb78be5290654c6fc07a95d0236d783b722e57c96185dfd0d93724ed148dbe42736a75e7d602fc37f96b8c5622981bde2c074820defcfdc3d
-DIST firefox-66.0.2-ms.xpi 467764 BLAKE2B ab01314e6eb6006cf4e021e6456b7d4fa597ce9fc7928a00080a1975b47386f88afc605e32b467357dfd17be8ad128c469fd6367507119c526ed0d7f1080a8ea SHA512 a3432da55906a8a4ac174eab2a1f9e73e84653168e053229b8d5c3fb7016304513c24a4bedac7aabf7207c2140fe843c0cffa8a8a87a57ebf3947d44068bfbbb
-DIST firefox-66.0.2-nb-NO.xpi 470495 BLAKE2B 69e8635b9418f6ef509c490e31ddfa91df1c519561096d8d2161aa52ba4bec0999266ec78c70ef060a767723c7e162daa07f1bc588751f95f987d698c031dc44 SHA512 a61df0c2288841fa849202a21f32c28bfbcedde4f86e8e87b364ee366b72e4421fd322111128588c4b63335fbac4e6769595f5d0be483f1e3c924d8311677b19
-DIST firefox-66.0.2-nl.xpi 463133 BLAKE2B 36ffeea15fc47700cf11250fe6eade3bd379536cc8128b685234b571eaff1b82d742bf3222d3bddff9f8bf042e7f6a575f86394f6694f18df705f91fd2b75629 SHA512 af302b0575ec5bfa4f91e72c98e52510b90049a41cc794b1bc3fe21ae64dac0fa04b854273223b26c8c486f5f27ae906d8dc341600c0660dd6bbf3646ca5716a
-DIST firefox-66.0.2-nn-NO.xpi 469589 BLAKE2B 1330e8d30ae5c6e55e6aaf9dfd5254ed66c2197ee4caef2db71ef4e741aabfaf252c5e68503653b41a22c26346a3073efa6d15948036ccc8dee62a46d942e827 SHA512 f120475b8d86b8231167b5d5180961e781c446b61212b4c8d5b68a9412d20e57e3d2668fd06958fd784a9776df1bad45a08e1a576b669286abd4e6406833aba1
-DIST firefox-66.0.2-or.xpi 486632 BLAKE2B 1c0aeb0f3cbad9c52057316a258bd56aeffd959737d4a21a8db7164b4f98840012f31bbf3be11211550cd35c50405206f857c28224718c6d4c4d2c418d855c28 SHA512 39de1c52ff089ba1976354d764fa10ad12977eee188b64f65ad314dc1fc60af559158b6b565bea4449f4d8cfa4306d1e82892995b0f3f95a0f444316b0c2a96e
-DIST firefox-66.0.2-pa-IN.xpi 521427 BLAKE2B fc162f26dbd10208428cd8d03db035f1210e9c0fb020561d564b04ad45aaf95f2e984e7e486fdce655f10689e871a5f125d129023f9ce840f52cf8952eec3572 SHA512 66cb4b6f1ee36c66f2f286b5fd71ebade0b2b3b80fd52c23e20d1e20f37194ef99cb0c439694bffc97bf88b59dbc2aa5e09124a468983b56d8f3f5df84d67548
-DIST firefox-66.0.2-pl.xpi 454395 BLAKE2B a1bbe37481bd15da9727cff52bebf778d3069c74fa5d58e409a30f1df331e44c3b4b22ae2aad3602818bf4b9db1a04245766cd782c2e7c11eff8688cc223a913 SHA512 19c1b542a9bce3d217fac7e18233fed984c4f6cca187846f7de70816b26bc06c4c8d2197f65e972925ac4af73bfc7cfa1adcea7abc14f22558830b80567cdbc0
-DIST firefox-66.0.2-pt-BR.xpi 472207 BLAKE2B e4d64ec67b670661a5c562c23e610146dfee69a72a264b98eb228bc77900223daea55d7f4768cf30184eefa130fd618d1d290df7c31201cb877c78baa34c3169 SHA512 cd39de950a06faa26e85c13b78cb8368a6f7bde35106b52f1b3b4ecabd8045142d7fa86d5beb0e0b9d8d091dfc501a2548abca5727b9c4cb898e8ed36afcb5b3
-DIST firefox-66.0.2-pt-PT.xpi 482238 BLAKE2B 7808ef415f4182b27c1436b0c4e52ac76ed5b76850c63f5a59f43d32fd2ac221ae307a55738bf37318d23a22f03e94ef3bc236d1e2964021fc95ab5eb6c3ed2b SHA512 25fe886bfd190bf557c0151aa06845a972d8d5e3cf583be61711d12b5e763080d42cd2740c50735c509d0f637244fe205fc2f31ef936463feedaae7c5c8175a0
-DIST firefox-66.0.2-rm.xpi 475010 BLAKE2B bbbe1007c08b48b318f2ee01b73056a092597f225eed827256c1cc3d5b8f7854ea166f4192905a7b06e3cfb124386b86811d28d27781681666125310dbcbfe9f SHA512 23b8e058ecdc59172bfb0c3c811bfa48b2b84f9c2b2efa8993f4bcc286c40a31bcfcb1338dcda5721f71772b03b98aa62def9320728cb8203293e9bfb2d76078
-DIST firefox-66.0.2-ro.xpi 481037 BLAKE2B b57a6d1c9348b50dc21ed8459991f75dc4cf35ecc1832d2bf442fc49322c47f109dfda06a928c994b7426cd7d312dbe051503508034d35d026fe67e71d4a86d9 SHA512 0ce7c8ba4f9f17a75d8da669c2e53f4e2557b80ecff95714758338e122008822911229854290e120b78b8f9594068b91e8742270d7936ce8e4c7360b388ad59c
-DIST firefox-66.0.2-ru.xpi 551343 BLAKE2B b23f76df74aab6cec36ef9e9d6927d555733d6ab8021a39a54a0f1508386c85f3b2551fa7d8f89b378d148fb4387a0865c7d054f4a9f2808c5cfc23246abe9e1 SHA512 d5e34598d01c2ae7a9429bbc8b888a5343cb49f4cf107ddad063a4fdeb5f71d82749b9b3d42ba7e372ef40cae8a0a46d121ff0cc161ae59f2b9bdc918dd3bec2
-DIST firefox-66.0.2-si.xpi 513781 BLAKE2B 54e3cb79f9e9a09e85cb0e7a98049e4562d82488704d3c1746a4b646fbbec972b977fb3d566e70a2c4b5f9df28c14b9e55e1ce4a2c63817ad638dc1664ce9582 SHA512 659caaa511d6481d79aac890291628a6bd1ff64ee199d30245e318e42dbf909b9335152f5a87a6380cd5a64c8ec07f058c819538aa0bf6cc90f9fe4545ed263b
-DIST firefox-66.0.2-sk.xpi 500055 BLAKE2B 2131f95ec8dc2e824ae05cf4bac3cc0183ac53ffdfbffe08158e4dd02b32ed2900edfc08d09fee79820f37e98cf6365abcbe73d7f9fc4682d7d09658c3caf9c2 SHA512 aa6d72ce9c3266d5e219af97a1163d4b8cca2c94aa78b38a985a3c63a92ab3175c67813ae4523237c6420f97b89005893e98305eb0d03d98c73ba371b26eb827
-DIST firefox-66.0.2-sl.xpi 475592 BLAKE2B 76549050efc540a4f67a1723ac106901a07c42489c423961894ba3f4a4cf2d4c7a7a953657edfaf1af66c64904ca2d3cd7a6d114aa4e11ecbb5723ea474e1d24 SHA512 419aae969bf4f5e48eac9f66c8452cf33a92256f9eaeeb57c60776d0d252b683fb6b844669808fb95b4f797356281c10f060135cf803341d8d75422311d6e9e5
-DIST firefox-66.0.2-son.xpi 451848 BLAKE2B dff7ce685842176d831ea535efa8f86374e0107f444cee9634fc2f60647a152f913ed8f59994c232ac1c3ef2a34f0db9906fbd27fddb5dec780ce77aa47880c2 SHA512 a28cb2ce23f1329726f854bb252f183727cf66d361a2b9ac92c0111f36520fcff16c1b29bd91eb5ccf8a9afbb2418d6183454210ecaffa1730d496ee62838592
-DIST firefox-66.0.2-sq.xpi 491731 BLAKE2B d38b30077ee0f1a47137b67cafd4689941424cb9aaac1131db8a88568f4f0ac75fe912363cc8b86da9208c69d7a7c9a060f35e000692d6c9fa26d7e96dfb0054 SHA512 c82be3d2ad24e9b2065c4f5e2a9cddfb48f43bb43a4fbe81ac33258445644e19d94950a1a6decf0bf9a04a7a5f2c61cf7ab9fc64087737111a9a97ca274015bb
-DIST firefox-66.0.2-sr.xpi 513410 BLAKE2B 867d9d8fd0e1fc845ff5ee191a43c52fa0124b57ef715e45006973a64d40338641c8aac6e7c3a87c1f3e3297df1d4615409710b0182f17d57537a20d1ed4c4b1 SHA512 aaa06143aeb3e84871f95d57aee80957ae42104db1e3aba0ae7dacfd3795f00a2e99ee6360fcc3ff5bd3efcb8a80419155c89ff11136df2217003ad0ee2111b6
-DIST firefox-66.0.2-sv-SE.xpi 479568 BLAKE2B f727d893129ebddf92f072cfcf9a8fc83611c64f806be0794b004aeaf75a9daf440b36aa672a19281f85b0ae7ad15dec657b87bf584105cd80e3a95129488301 SHA512 ff8e54302e348cdd28b8252938e69abd12f96366cdc1f186cf40f657547767109f14784d4a5ec55b3b708690c82b55d3da0727bdfebba78decc4037678554e1d
-DIST firefox-66.0.2-ta.xpi 534135 BLAKE2B 93df03681c8313f9bba55584dfbb270cfb35f967c61be44788ca4e77ed80807c8ae1b060504b69662a766db7e8eaf84bda0527b48c9a82f3a1b124ed394d1752 SHA512 f47429d068c5423dcecfc4532fcf9793ce244762389beb1ecf7156092fd25b55831a793ce94c435631717e390c65c79d9abc953367cd6b4a895eb7551c5db04f
-DIST firefox-66.0.2-te.xpi 540396 BLAKE2B dcf67c475683c048e62fc7329895cd47bde2f711237d8220b35378f3f434a5bd8698eb2c2c61c8f1442ddd2b7eff8dd2bc09109c686b87ed3500c02cd71aba68 SHA512 f470230a4c6543b2ac802300bbfe1cb3e0e1c1055ef12afc4eddb253cbb7fbee6602ccb99dda22698679a6ef4a6df19a6781b82789b8c7779e4e2b5d2238a5f4
-DIST firefox-66.0.2-th.xpi 518918 BLAKE2B e52ea489814de497aa03af04005c74315ed32937d98b5a4f4aff604b2b731768bb30360510e1cccc5a84b0d41e217cdd3dbc66e16a978c2cfb3ca0abe4accdb4 SHA512 8bdb186955677195014c2f88d6930c59fd6d59b790c5a9772d23f20be973d3394248e4ec17e7cf4f04166be2710e2244c55b94ffb1941c5109d8d933ca724e17
-DIST firefox-66.0.2-tr.xpi 489585 BLAKE2B 8bbaa21c6b17490b3c3172b4afa84279f4a9bd6a5a28a2e9a0f5c0c432135426b63bb492e6df5953a34591d57d60227fa4ebc169863fb7be3b2b7bd1ac21575e SHA512 b1012fda43f33239a6e98a6bd58a6d4ba49a5cd8c62f159124c8f99dfbd2c2f295ee9ed39f7453487596ca410494c11bbfbace437a3e9158857b14f1fa663873
-DIST firefox-66.0.2-uk.xpi 530132 BLAKE2B e0d6008d93c81ce4206b79040321645d93633955d804a399185385ab658edf15d7639b41a38976f5ebf876ef72358b4a43e64c22388c6baea2bb24ab6fbb6325 SHA512 bea9c6431c74995b677d6fda9a4f446e413a11e16d440fefbcc5d3e89de33be0778166e74801f121e8b7a06bb9b9d229cafb7017341c9dbda534ee2cf475896d
-DIST firefox-66.0.2-uz.xpi 471551 BLAKE2B e01fd322453bcbbc72d4555863ec7dbf77209f2f5a1af768311e13726ccbb9435f02907e1d6861f59d5f86c2499ceda2a855349dd65cee7f38c60291cc74b729 SHA512 28af08a2756ed19c949993a6e71f0c8d472699d1e48b0f218bdd840845e1e400921b506ffad0bb5e7f098186bde9edc0646cb8a677132a0533e147971412acd3
-DIST firefox-66.0.2-vi.xpi 495127 BLAKE2B ac4d1d1deefbd1fd03b105fed788b2b61206c6a8fea35e027dfaa58107aba1eb90fdd9246ff433882975835e46b382de3bafb58f30c9b844c005e641e2d40da4 SHA512 a22bcf7e098f83c0bcc0566a1cd66f76b2e8bb8992ec3b8699b7c379d51f425c2fdda43bcae7fcf1081529a2b674947c8ecf36da6564fb838b7225ddc3de104f
-DIST firefox-66.0.2-xh.xpi 463580 BLAKE2B d3ceeb9485071d0e3aaa09a43d85c09d91080cf2f10d2a31199c148a56f930c57c8cf37916eb0f6442fb26594941c0a8faa0ceaba8f65a46afd8ad5d4b524c5d SHA512 e93af4d1d723787059d390961d4707e310c5f88f8bf52fef850bd7806e49ee300a26d24d070052434e5699e91a2d928f383ab19c1b92950b51eb4b1bfcd611b6
-DIST firefox-66.0.2-zh-CN.xpi 502889 BLAKE2B e639e3c4fbaa83dca65a9213df6fd8ce4f93426313647b20addf2cb74f2e61937a76e2aa773c3a7b713261db3462dac8589cc612352f516e3cda11cc50c6b956 SHA512 68ad75b505bdc3a87bbf4eddae1ada893bc02f85020557129e1ac549978a7c4c1465ba4e6cf405f339658f1b71ea90a3316287fcf8d91b1bd684ff12514e8aec
-DIST firefox-66.0.2-zh-TW.xpi 500704 BLAKE2B d64232badc68d359f6dd2d5459ad879741e87b8f7695bac591d822781674731abd14bfce9fb112cedabb957f6f33cbb65604830f48d4fdc832763fd82c7c75ed SHA512 3231f1e2c5f727a52daddd9fe699afe2fd44b863b2192cc38e22c042221f89a55b3fb39060967113b2c1afa46d1d94f787a23284ccac181749ff4490eb8f887e
-DIST firefox-66.0.2.source.tar.xz 280704196 BLAKE2B 23a8d0495d903ed99d460b06445f7c9e2872b6dc19f9ad28d6aeb42d7fe45b69ec006d8303534069a3ead52a9c0cadf30d16f492270c8117284a199b632498a9 SHA512 2246f3aed4e8a1d557a2383204e926c45d63d7977032512982b3698da4d6260b67fa91507f1a103af0af77198b7ffb34d6609159729aa7bf1c7c16cf2f7efc5b
+DIST firefox-66.0.3-ach.xpi 463165 BLAKE2B 9ae136e35bf13045c8ae8eb07bfda0eca0f0ee0cc6a3f53e1e182946c2113d77e13102b3e0a657db942bd15b3246686baf31f9f0e2f6239a79c9a0e6f5f5b341 SHA512 729f6f89c1d2ebabd54ad35c0815d9ebe5f1d8aefb6dde0a8d1f888946a5f45ab4c8812ded70ba4464e60af45870c99a3fe0baeefd3bc719ee62f9e02f64bca3
+DIST firefox-66.0.3-af.xpi 456291 BLAKE2B ee29b621c0887e6d196102f54c0b67eaa45c41bbee015de6ccfb0bc0c14238bcc062d96dde877616725d2f7f37711e336920555fca4b2ccae9f28fcb9146c188 SHA512 2c4e1bf864077329c3d063796aa95fee336e91b85aada2e59b133088efd9aeb5ee90539f679578ed128342fe6be8ac29a2a33a4f17d778e4e6362da18e63b824
+DIST firefox-66.0.3-an.xpi 480229 BLAKE2B 248d17221264a8919c991b4a9f70049471c6f6a33d8768374eb4124005aac1308347421ecbf2dc39b4d46db590c741fadc2a30eae9ae862a22e5739874927bea SHA512 df2d41188d363543a2a9deaa632a665042d709040b2b5df7584492a948513370461f17a1d863d7472a02b8087a7061a1681899303dd030176236b5d829a80e45
+DIST firefox-66.0.3-ar.xpi 532247 BLAKE2B b27c5c8378fcc8e4c790e76c0f6316ff759290cc611c5a8ba5be1881e4edea08a086dfaeaab0bf136398eb8e58b9206cdec7782236ca53480959e72f14e7ceb7 SHA512 60d0d50b881a0acb43c26a07a2f6cc2bd311dcabc1b24fe522d28f85163857ed2b31ed2470305a8be87114163c0e5e67da9dee31c53114fb1ae3fbf7b91d3714
+DIST firefox-66.0.3-as.xpi 492220 BLAKE2B df678a672ef192f286d6b30cdddceec0d908089c06268cfdf14bd68abf9a33ead5cef8b8e129f3d3d51ade914132908f752dd1b0382602f87cde903377c9c61c SHA512 d2b63135a06e1c68684b594159623df09b5587521b1613592fb9db5d2019bb424e2b3d77bd0c7dacbe571f990b9a1d54e692ed1899d274c047c07d60fc5ef3ad
+DIST firefox-66.0.3-ast.xpi 480122 BLAKE2B 807dd9d7d4160873d0421ce9a70587e2be9a6d9fe4d41794e92cfc3368ed5db33a5ea44ac204e6a091b094856b60570a5e447802d0d2b7f4fb04cbf6204ef26f SHA512 35c4aa7e4a40162ee902ab1ea3dd8eec569ce05c6f1883398d94e0ff671165126c863fdd797e79298e853b652da67b173350988b24f85fe2dcb3f45efb381873
+DIST firefox-66.0.3-az.xpi 505912 BLAKE2B c7d486010a6d57ea999aec01e813cb70b38130c8d12c80dfd262470cc0a9278a0de14f3e9d7ba95fd1f2454470a57fee84f0d515f1fa930208359764760c4c95 SHA512 776670efcfbc538336944b04be65f7c433a73b4a857714ef587133bb12a574d1e85041e013aa6d03457a0604ac6d613728ea3e6cf9c47cc0a9991300184518ed
+DIST firefox-66.0.3-bg.xpi 542704 BLAKE2B df13fe0af911d274b02887bbb0f7d3f391bef8244949564983c4f7b55c25cd817a759f1c12494549f4c9e5287f7cb5b4cba23c24b11e4fff520176f7f74fda46 SHA512 f11f431cd0ed4b6dce6bdd4c7cdb41179cfe0953ae0f1252e91d1b9e83bdd9c3fdff8bf8183e8435555b1989bfc4d39bf47c5f89c18965ce016968b12863c0a0
+DIST firefox-66.0.3-bn-BD.xpi 560561 BLAKE2B 8900a43d6b7020841022e403f86b2f30c9eb0c63b8c77f8a871afbbcaf3d2e9f68766be7d8ab0d0fca4df57a06eaa0cf67d2216bc59fe0ddc5d5f0440d646751 SHA512 2050a72f9c6cae9413efd98c0ed1f69cbd701795fb423cc7c3cbd0927771bbdfb156d3cbf1681cbf659e474b91b733c0944fbc994b5d26416790efa6b2b95a48
+DIST firefox-66.0.3-bn-IN.xpi 550576 BLAKE2B b582c4d603ec55fcba4ace405f6a8f033146d4467991e2b8ac8acd99b638f2c479418240175c8ce7fdd73a3a9497b64d352033ff3ad5bf073d29dab3e35c0bf7 SHA512 ba2b079fe9a2b9be7bd28b37dbbbd92dc92278947c5855ce27750c95338dfbc6dfa1855fd8ee6c6194629e1cb11eea38db4b1901eafacc70f150e19c3f7c433d
+DIST firefox-66.0.3-br.xpi 485439 BLAKE2B 19d76d39baf4b244600dc4a7fa8a99f0b941a27c38231cb136703c74e83dd86ff46e420c9a0e837212eb13b758e7765ede29f6468b1161595d3932dde3e0d780 SHA512 ab8bcfcbd40d1c412f1f9bc8d66c53477a5bb5d30467f8fb799cbae4dbc8384d47adb4842e2b502a5beec9000f27524e1b9a7445b400f860edaf49f569d96c58
+DIST firefox-66.0.3-bs.xpi 477831 BLAKE2B 7d21bb3f11f34c728ad788553d0fdc242128ddcb5bdbb4d5e1fb348f08c1f4dd599c0588675742186c11599d291a9a348882e3015d79426846e9839c710dd29c SHA512 fda29d062fa24938e1c3d4437f3dfe8364581e58cb5f1ef878b421c1c21ad484111effe7b370583f7152e13d777600479289e07932b49c8f675238edac62c730
+DIST firefox-66.0.3-ca.xpi 486085 BLAKE2B 0265bb109a8aa788a1c298a93fe1d70e65a9f49aab067dc87d1eaa0bcde9b76ef9c182a55cb7ddbe9d404e44bf7b5b611f1b6186555ee9959d607ce90bac5aa2 SHA512 0d753cd38b657a9d036b6718f1d8f5a86dbf6a1bfe51d3d5bc0cbc9e685c534ba4fd6f196ceebd343486e1f308b2e365d5a0fa2b9e9521d070e4f14cf54663c4
+DIST firefox-66.0.3-cak.xpi 510197 BLAKE2B 30f4be6ca2213efce6b8933a0f480f6d5f1b802990d24aa860858f4fa77bcdf8de766bd6fb140731990240b3f23565e1b3aa9b272739f371a2bb04a148f06601 SHA512 27052158b6e7cc5aa6a80a36216e2a86889750d8168fb1befaa92979a9ba981be04bbe38c75ab78a905c80f3aa8f673fbfe4beda475f3ffb7df1a63b2e2def4c
+DIST firefox-66.0.3-cs.xpi 500276 BLAKE2B de51e139f8700bc60c0df2f4feba7d7baeab964c17c2ff9fcd2825221a5bd71203fe593d9b006f3774dfbffc88f77ff475d4fce0d59816d4b64f0c4a09bbdcf3 SHA512 06dafe9aebf2bab70749fe7d2e5444935380a550a8ff0de3aa824af72b7820a39308ad85ae34c8600969d52ede1a12474f3641a53f4fe6d68ebe2c4021b2a762
+DIST firefox-66.0.3-cy.xpi 487231 BLAKE2B 2384b7db9af647cff25defe36791ad3dbe7aaf749de3347b3856a90ea8867eb4a8eaac077d2cfe6b79e1ef4ced4d2ac6887eafea5431bbc6351ae1e26c205ca4 SHA512 d8bae289ac063b8f75572be8af2befa824eaa99d7606dab4d095e9556e370f5be1f3aef12f6cc0057c83e2aeef5a77a1e17e8386eda533cf8b9bf239236eebf1
+DIST firefox-66.0.3-da.xpi 498350 BLAKE2B e9cdd54fad16f6bc89f4bc25096599bb7dd4a37310bd3a072aa6b6c5d011476a52bc40cab6693d22474b513818cb5263aa7c9b429e23131df98ccb97be805075 SHA512 9b05428c5ceb4c868068dafac19601471556156de65b5ba2fadca126e4aafc056aff7f51339ea44bf2046687fc789713078a1a5024224012798c105ae085d7df
+DIST firefox-66.0.3-de.xpi 497265 BLAKE2B e573f7ef99ff29ab497709e28d079b89d24986b9c7e0843632e66f63fcad0e86a595e51f7a9dddc7c67d167d10cc21ac294b32ee09b62846e6bfe3dbd13f577e SHA512 7ce4cf0e0d759885b2a388fc7f1bbc9768ee076e2daa11f6bd1a4db5d818982aa2f827c24f0d71bdb9c841b7724272d7abd78b3b1888ee7d1aaab370a37b2a51
+DIST firefox-66.0.3-dsb.xpi 509241 BLAKE2B 06dde64b135282f38342d6e346d1c99ab4b7df70f80f12389b38c68331338ad4b92b02e0a7fa1870f01fd70a2db6f5f053b2b411e8196afb14f4f44bcb53a5d5 SHA512 fea4dfe972498e3533ac32fdca900a72dfd6f56c0129cc3e59b7573f0037bc25025d05f630a7e978656b4a996b9a3f13b6f73710ebc76642626df86af370b7a6
+DIST firefox-66.0.3-el.xpi 569704 BLAKE2B 4e378041cded30b44ad2daadc5e7eead77418bfd8bfd42bd73b9fc3f5b747cd59058de6214823a7598690483700a9d369df88884d409c3771c46cf8473f14006 SHA512 44a660a4f0641ffb9a71684aaf245ff940b9277c925ec7275d2ce7ccbd40c28b03647eba83622f8e53453fce5e409a7aa1151058ae9df272495c77f091882d4d
+DIST firefox-66.0.3-en-GB.xpi 460274 BLAKE2B f52008a4a3632be4653561b2f37e064b01913963a26fc9f2ad51b0fac14411f0d926af3f751f8da6ca3e349eaca1d44f18cd4837e548174ae154468f00ed3e03 SHA512 f0eba3e796aeb8b0b67b4d90155fa35c43d364692b475192fb92a2b4f2c1cbcf945468d87333d1e744e397a99f06bedacfd7f093438a711481207fcf3b21cac3
+DIST firefox-66.0.3-en-ZA.xpi 439432 BLAKE2B e9cd783bc83ef549c1f60b2ad3034aae1bc7d12455d7efba68f7dade98d0eb8ce0236d099bf9ca6c3edf571e3fdb48f7238e3c7d2a4d352b8549c9c584dc2307 SHA512 72b6c7235affce762faa74706230eadd93fe89126c0115656b92a8a8f0260d672110888ece1c3a5563b6b3936be9f96e1dd8af56a2c83e4d82a67ebc5ff8e0f8
+DIST firefox-66.0.3-eo.xpi 486252 BLAKE2B c6ab67820ad4f3dcf955fac17f5b3eac4c86b4b140624a2b98336cb21240cff8366a1102db573a3159b0406481fc7a001ea8494ffefadbc58caf4a269eafec68 SHA512 4b0405b98eb4aa33a6e63b6fa0c8254d1a6ac76aa5a4d7c3753fa0f074cff4a753b1c2d02de438a0d7ae4e2a3ac9492e659a2171adfcaabd0046adf45f7130ef
+DIST firefox-66.0.3-es-AR.xpi 493704 BLAKE2B b50c8cc4e1e08e4c2657ff3e3dd6de3a831e44b7ee9353579d903cc7dcd5cc7901a4156c023f59fc67fc1952c6dc7dd8fd411d704b1d7f8c5ae6e578ffba2b30 SHA512 221b0aabf34c8f9fbe3119d7d3375a86dcebbb4eda86680bab35d5e84b2fa9254bd3d8f2537ccf007690c9f8b178f89ba68d97c8ee5633dbcbd7207a861f1694
+DIST firefox-66.0.3-es-CL.xpi 490309 BLAKE2B 4202061ceabd2779b52a88bcb1ccbb801d648d386cab8af7fdd48202d6d8e20e7911d2d8714505744230ff96f6724af37fef27e2f212df73b4e6d649deee60d7 SHA512 32715fb5eefead176a558a1c016e15bb4f8563776cb54151e281fab9636eb8bbcd63c9095e756a4c02f0897ffe5dcaee1448cb061dcdc672054b255f8311b983
+DIST firefox-66.0.3-es-ES.xpi 454489 BLAKE2B 842315c45ddf97bd864fd74265dba07096a821883e3518f5e6a9e5e0af1aede68ca824b8a73354eee62593be12bc0c3943be3c4564f2d155316356396819c3a6 SHA512 8f47583bf76faedae6f967c093952ed1068da3c7e410c7c732079bcd1c371978bd244cda243cfc59403616bf67daa2fc7ebc79b5c8cc08a31e31b5e8813a62e7
+DIST firefox-66.0.3-es-MX.xpi 495323 BLAKE2B 6c5a9115ff8dadc5dc7e7762063d698330843924b5a8438cee7a4e2aa2e5f012bde0dfd5e36d0718703cd13a319fb95f6340cbbe315da8f8790256de061c92ce SHA512 d90b3eb12c1e1a5799b2d24ff35c31bf970ded29146f7eef3e40d410226f3e12f264a4a50dc33b4d61fde42ebee46bc24bb73a78ba3e885057d4b876770ac908
+DIST firefox-66.0.3-et.xpi 476492 BLAKE2B 08741f3fb4843cbad2788a58190c428402e18a77c76704e60c739bdd0e0f2c93279450562b4d0d54861316fa3c5ec3f515917f93f61f2f578615b573bbfd7df7 SHA512 d658f890e4cd64276e0e48feb52d4dd469ab6ef96e08338b985b03cbcc79edf5f1d60f7ad21a90f2c34ad5edd988e5982f3766aa58c7802de262042e27b289be
+DIST firefox-66.0.3-eu.xpi 484522 BLAKE2B b084fcbe9f584d9de40b17fa47e79af732cf9bb37099219ded808ca85106be68355214f30ca3824fa111bc2f98190957790674626dd731388986c8dfa86ea305 SHA512 fd3eddb2153d24366e664d98d4864ec2f7f73a9ecfe17c892a2a38b4f18ca89d83ac234f3a86f9cd88492e1f4f26da7239925fc65bbbfe5273eea34286b7d060
+DIST firefox-66.0.3-fa.xpi 544115 BLAKE2B 8efb7b8226e74c9249347a0a36d54a746e8862c1934d198e86ad92e5f3feb1211d4c0a3f8608c3a4d37c4fb81e4885b5817a329b37e330083f9094a6c74abbec SHA512 3321e944cf397a3e98d145231e67864cb6add44cb9e3387c31d696840741ec4626a4c1afc838900eff4084f8eeb489769f8c2989da73bc305ed3121c72c529e2
+DIST firefox-66.0.3-ff.xpi 480088 BLAKE2B 47a0fdc32f083b1766ac391a80b5da96072c4fede54ec41f79c4005575a1722b5cb1898447540047980fd10c74b34c14a7227fee1fdb6ad3c9620ec95d581694 SHA512 4defe9a5b9d84469e4e36774b579e63020e7f0222d58a960bd320fa3d81037b3b620089b56a32742d94d93db9fcaa690327f48d03662798590f94915e8d94684
+DIST firefox-66.0.3-fi.xpi 475214 BLAKE2B 6f7794ee34a5b5d0ef1584374e16b4294820c0cb5945d5ac1d9422017ff754531c50061cbadd1ee45685e23384e6982a5c78e09024466491fe0ce92db61a3a95 SHA512 53fbffd64cbee198f092dac46670dca18b0f6ea8f3808644af4962eea9cef902cfbd0c8f544fdbad69cf4c090f911c7ae9f9436bb125686d23272cbded535381
+DIST firefox-66.0.3-fr.xpi 501548 BLAKE2B 15572719d9fe5fbca776c85fadfda9b11aa22d72ca98ece03ac374deeec3502c66f425d7cd0573d94d64d0a4d3edf4a55a4bc890604c084b4e909b6c26490a2d SHA512 6f19dc3d372263a05ce72d52a9c660a4e2fb21c836bf7f8b4750000e3451f29201987aae67f130a8cc951c6c828a38d486e872be54fb941929c1d77a14a8e679
+DIST firefox-66.0.3-fy-NL.xpi 490994 BLAKE2B 23b97d878c29f677897105f37186733f99e0c4b7d361803f107e4208117e961df617889c1436c1e033d4f69b4b31a2694fcb3e6cde51a64a22f3cdf9b1b83202 SHA512 7363522b92eb4fa2d08bf71311efd44f6c914e617fdbd7cc3ce9a4dabae979dcb53ac9e4ffdd4c128b64b6e5c3d668c33601f4476477e59553dc54dcfc9ec820
+DIST firefox-66.0.3-ga-IE.xpi 485169 BLAKE2B e6a1f9df1761f8bb65e7cc479c42859236f23b2a9e3e21755f41a4f7d53272e74ea7e512911ffa257306981f3564a804ecfff50db38b7768eea4ccf151416485 SHA512 7d0dde689a3c1c32b356b602f80c1f7e9beaf0f096dbda45fb7a271d2d88859d21e815621309d097a4f14e8c25c7fbd3fddd010644436d40ed708bfc9774be82
+DIST firefox-66.0.3-gd.xpi 494699 BLAKE2B ae08a28d3538b195d4331d24019f17ae2b89abb68eeb93967e5a8313bd34019f47b37ae84620acece98bcef87a505c9f6c3ac6bf53cde181dfc0e2fc0914a97b SHA512 b715e7a0e22f2c8aa49bc5fc3b4dc09c48d56dc12024eaf27432975f4cb0ac991a048f9b1068055103749d1901eaf94103ecdee32aa68a6521a1e16f60fe0915
+DIST firefox-66.0.3-gl.xpi 478919 BLAKE2B 58c7dafb5bd0196d685c03aa7328f5155a04e7dc5f420a03dbdc2eec6074eb0f36fbf84a6639f472af3ea9db5afbab28093d8e363998700a873843fde88b7463 SHA512 7f7845976029b47b5ec47bd268266f53359b0847dc030645f0c7789e271e069bb41e416aa1db0530df51d8be5662457334ffd37180daafd4b5c0917ca54eee96
+DIST firefox-66.0.3-gn.xpi 503247 BLAKE2B 2af413b0a543d6daa900b985378c5cce4e6a2cbd38243ae47b83f71342b7fe7cfde84da54c52aaaca4a6c3ec6f9b74c7624645a40c078d38a3a5dbea8f868a21 SHA512 3365370301948fcff83400ff80b11f8abdd1895b3fd4e684a9126412140d44450f366bd14f6de351c8ae3d36ef3abd9334a643e6d27a2ed1fc809c47b240d680
+DIST firefox-66.0.3-gu-IN.xpi 566203 BLAKE2B 74e1f27abc0d9127cc26595711ccad9c819713b64c04fda1d82d7f21dee2f8618ddb9fbd0e5f6e9c9ae6d8b52db7d5767db69951e859bc5f78b418dde1a1d14e SHA512 2504a9d7085035da451e7b98d0371435f141dbc88e02c9782b471f05ca5e537462a846d46e11af62ce0fd2054bbcabcf1a9be2236295af48b639d291e833777f
+DIST firefox-66.0.3-he.xpi 504754 BLAKE2B 1ad607e8c9d5215f20e95954ea74c1efc0613f5aaf2acf4054236dd6946cf9a45ee28cead9ae1939c2da67145ad2d28ab93ee8a9e68d36f2afb17a23b67a9ab1 SHA512 28664f7ad1c443211b1584437ea9abce7446f2e878f456871c350ecfa7699fd6628d2fad278fcb00fb524ebffc3949eeeae35ac082d250cc1bb568fa3ae44463
+DIST firefox-66.0.3-hi-IN.xpi 551701 BLAKE2B 076712bb04782f80d036218f6f04bd61ab8fe147229c43ac81f858f101e429a75bd64991900d288ff729e89463ae676376534b7e58ff110e4bb643b9a48f0348 SHA512 1877164ffc0e78f7a643d72fa7e0a1a02a19cb2ac2c40015ed28fb95a8d805958800b6f4cce961969f76990c3ac80a2ea2fc3360184500d724cf0f5fc8ae9d01
+DIST firefox-66.0.3-hr.xpi 485246 BLAKE2B 6e6ca544ac93cc782addfa4a392ce03cb1d0751842a3c077c3b9b203f5d5baeb16268f526a2bc694ed67439353d0a9ad17895de5dca325b9d11c92b0908138c9 SHA512 66afb79374c5f2d4dd56b88d5527c5d90029db000edac99d24b2506cad5ee732cc051d81c1eaead2ab57e8d8947506a1846743cfcfdff031e4adf76129a53864
+DIST firefox-66.0.3-hsb.xpi 508412 BLAKE2B 8d1b9aab2f53ab904ad47eba61c527c58dd7de7a81571ceb805b2cd318504a799feebff571df62140b83c5a9b72fadc5484f113be37984441118e05e2bc3ae99 SHA512 e1fe19aa655c5b23eff4cb79fb79d69312312da52c8cb5ced55dbd7d6691cc0f11125e5ebfb9e154d475a1b17d6fd8fe753b833776212e68b815b64aafa489a9
+DIST firefox-66.0.3-hu.xpi 505598 BLAKE2B 7403bd8ecda2f6e750d17dd0c3dca5115bb1fe7b4baa8ec1818efbf2f26c73517af98b382537accf8a45e404a6969a1498c23ba5d13f2bbf43d5063a69ff9263 SHA512 2ab2a0507019d0ec5e006ae521e9f48193934041197b6a4f025b8048211ea8ce7e20b2cde7124f08265e0b9f9793e31f7b3d29e9a59eb1b1dda29515db7bb569
+DIST firefox-66.0.3-hy-AM.xpi 534781 BLAKE2B df64b29724338cb1123e9d773f989ff4442653639774c01f7c007d1b404bd80030b14392f32016a254a7aef174af65b386ea67fcfb8a9b902e2d314bccac24ad SHA512 2b624585f43fb4001044c9ec243fa4e380b5bfa66d8a92a6e0d6935aebe8840feb38e54675f17e5fc1c45f0a2b04872d630b4bcb5c3d95c5781ace2710d42ac9
+DIST firefox-66.0.3-id.xpi 473939 BLAKE2B 1f596916947910307b645634893d069eab97c925decc21d1ff26ece0862cd5790a04477f89a2e36e3c8caca40142db4cf9d5b2b33ce0a4228bfcd8daa3746e86 SHA512 a47470eea76bce2ab54d1341019bbcfa3e8fc1c74d588c75f8186511a9b491653a057825a4968b432b984ee922cafddb1b28c3c9eaa69fdb429f087b6d88a5ad
+DIST firefox-66.0.3-is.xpi 486820 BLAKE2B fb398d6387ecba6257f9ec8bf1520354cdae7d69a7da8877d37007f7e31ade463ea1606108ac2939b93805189ff7f5c5f8ab77bb452ccb45eb3160267ffbac18 SHA512 345b4669bf74f7acecf253808b1ac972eea6d21c39d75da182faae805388733d9e5907587d479bc6ebfddf548c1534c9a4a034a9a0d088e3d534fb26238608d4
+DIST firefox-66.0.3-it.xpi 373670 BLAKE2B a0eb679a8e5ca3b355bf9af9cfd5392861baf76a8c6edd1ad7bbcd16dbced1d9e9c8d4920fa4ec748cbd2b2969f3a40ced32042d83ad4e689482f96890b76f1d SHA512 e1e0ea952a5d2facd51a432445c39d29d5ce0983c8439ac759a518526bc5b16c0e2b29672948a8554ae767e03aa2e5d1b60c4b5d0d0e144606ed8404f990c384
+DIST firefox-66.0.3-ja.xpi 521090 BLAKE2B eafe8d2791ebe2cf454267d3bc663c0d5f91aa5c7666d46a42c51152c9ad4637f1571655ea3a566550e0f5b4eb23821bac45d4f1a80c792f130410e36b87e4f5 SHA512 c3b9d9145b3d91496b256b3c76ec01a79b5ab2b0196b4853ca9212ded0303afa7a05d25f65dde37f3e4fe4a2b2341ee384ee6ff09a30dd26a5e69d861040245a
+DIST firefox-66.0.3-ka.xpi 529194 BLAKE2B b2eced757a1074bbd637a7631bb03661ba05538503cc82939818b06e38ee29c3d2be7865ac3a2ba0b46c7969b79a1318b689be1ddd1ad28431fa0bb83b10f811 SHA512 a470922405d71005d5f06dcaef24e40386f947a65b313958524de0f5544f9e22c7801b746f88f7bd089d560386f84e55f6ba9c3c62e6e4d80da65b20ec53c133
+DIST firefox-66.0.3-kab.xpi 497639 BLAKE2B 7f51f94e673d73e438cf24ec1b32f3a947c31255bbc7399b4c2c9d5f7a135cc534789dd29d9a4d6bd3a7f9fde8bc9e1c82b8269f923b6d12d75e9b357e7e8411 SHA512 e90861b7a8041039706a121ab6a2ebacd81077e1118b47fa2e954d03d0243b397b93e9c0358368a17f05c1892fcfff11bc6cf80f55c2fea77cb081167793db67
+DIST firefox-66.0.3-kk.xpi 559163 BLAKE2B 51304741df7c14ad28f8cd1f8ce9522bf3713b89a16001dccb0ac6a3f6a7a703fd5f11303f891b8367021d1bfd9fc8424555367b42538478ee33b7918ba56bf4 SHA512 98b77880c6b354bd4978b46fcfbdac98990a53b69a251a19ea275c837db2e998038bf2c2f7b1974b6533fae9d7011a5304ed41e4b42ca52331fc41d056ea247e
+DIST firefox-66.0.3-km.xpi 550697 BLAKE2B 7442c92602604f6bf8e2a2a9589c968a1b63345cc02707c999d4ba333fe69058b80b9eb1d00136be331467d91f47ab51239c67785b70e91bd2c5d44d0ae1c54a SHA512 32b0ef68004ee45bcff1dd3ce054578beb8bd2612fdd7e6948bb1e50e5abcc978b679c9703c3de73c2fb09de1571c0c6ecf110a054ba79b84a583ec523f290f3
+DIST firefox-66.0.3-kn.xpi 548348 BLAKE2B 3c538580cf199fef747aeefef2a7a344f87d5aba7d37c713cae0b90eee0fad03d1be7a088122d6701b4384bef65c4b7468fde9a214d9b95f7c54824ea567c1f4 SHA512 3568e449f5600dca9ae6422205faf8d17364117068233c5ce400ff61e908b0f1c69807c7e172aae1053dafbd5c5c4374f51671fb28a4ac38f58766be373846a7
+DIST firefox-66.0.3-ko.xpi 514531 BLAKE2B 39ac2e51bcf3b3b8598c48756405b1b507e065a0b76dc9f34effbd10ed0f3910f03782d6a4b41e6e23e718b38173dac0c757c25d33f2c6ea05939dd63b0fe0b7 SHA512 5e30f6d46e2567f2b977f6834404942531b132c02e4dc1a364847d40e3bddd722207c2b2e6e191008b1f641efbf1cdeb75763ce19da2b8e07fb69f65fb9449c8
+DIST firefox-66.0.3-lij.xpi 480973 BLAKE2B a59462ab6a05414fd84f2d98ae34d6a07beb65aeb5bfbeb7b9714e518abc3dc69b157bf7d6066481cea71fdba155c9df256e5b3dab3e82536f3df0dbb72f3c11 SHA512 9b96832b62726e6b875cd6670878bb42d74d23ff71e09811d8c00b7b051aaefca3bfea2067856e7ed1205ecb3397bd4d0928c23e41784e49b82cbac2dbeb8fe1
+DIST firefox-66.0.3-lt.xpi 508153 BLAKE2B b9edcc780542565fc145429d2792140c6d261f7ed04ff8d12c9276c4d79521d4178e03f892dc46bb022cb59687c9d7ff9ac8abce746536995174e5fcf718db3b SHA512 061b29f10e88f01a5e069dab4ccdc8946a270bcd757a7ee8c9ecafdba2355413cc4b1718bba7f46dc71915a4209b1d116af8a229a4fd20261adb854fb60d9394
+DIST firefox-66.0.3-lv.xpi 496605 BLAKE2B 977cb0f58e3f66a44024ffc7e58db4da44970cfe2b2b6c74afefb7c5e8d8e5aaee72e5ac3b28883ac9dc669c585a6cd7578027125242c04cc044b818784843af SHA512 5cd8036cd5acb7670106eb2274212982f3878250f336c096ae85df0e4ebc8ac2c85460176aca2e68d6c985a404b7b990702485422fe3c8aef305f3a5363cc118
+DIST firefox-66.0.3-mai.xpi 509514 BLAKE2B 62669a8f90550fcf7bfa412b8e8900083528cc3b55cefe0f55f782bf480f9e1b3dfabb67c06d58ed191de3b371ba2f6d67374e95a01fe579fd5fcfb003115637 SHA512 0cabe72988a6f193657df9ca9e3d6f5c7d79b903fa48519a7d42d2e33915e5457faddf96421f286dd6d2afffac3297208254ee23cd7eebc48e27f9943e7d447c
+DIST firefox-66.0.3-mk.xpi 487202 BLAKE2B 74a1d876007c5014ddc480ebf2a71d63837f8a827ad2cf5fbd87b377c8c53fa42fb8fb141bf835e13da5d589fdac8037df2b59f7c7977894ac5948c4ebeca572 SHA512 2e9ef3a4170c634ec1ea1557dd3cd7907edb7942658a31224cf220d7edf97fafce4b909d01f670299e8b5f2dfa320e230d0298772580fcfb5bdb0cf47e8f3d8d
+DIST firefox-66.0.3-ml.xpi 557256 BLAKE2B 5977b47ae57e7f76772fea6d2cefa5d7761ec4428af8af38599d0d3f98b81d5fdcf93359dccc95445cb0b4288b8908ce1299b12be1df53566afed67b2096ec41 SHA512 6b020228efc0e49442cd6d15f447f34413ef52421ee6fc6705b9bdd3a1c1a309afa5640b51a60da9df9a70e5b8308b0ede61da1aaf4d9857e5cc5c6f3b45026a
+DIST firefox-66.0.3-mr.xpi 547445 BLAKE2B 320e326b41fe2ee4c75177a851a146cc2f0d63a72b26ecc2f4d55a006bde251128dd5b5cb56b157866d0ddd2854f4d35067f8ba7a25e3d7730c9a8065dd68c76 SHA512 e3e3cee8309b0c63176a35fe475fa7b8a494fcb1b89539a9f77f67a6340a5dc320e76dd45e06c73d38a5bc8ff04897991205f60865ecae8538a6ad9bb28f3df3
+DIST firefox-66.0.3-ms.xpi 475840 BLAKE2B c70c276f3640e3de0512702417155450f8578a5dc8a96531c32560ef45764c2da379cb0b88b484a847463fa427022d48b3ba9d31178266cd9a066919f532a373 SHA512 16c47eb08fe7e76c3908f6ec9c99c3b45ded7fc181d9b0d50aa080066bf4c1cb7063bf670c63c33fcaed9c4c1b09c0da489aca55e89394bf50be51774ccb6200
+DIST firefox-66.0.3-nb-NO.xpi 478894 BLAKE2B 5907eea3c3a5e4c6fb569d82f253f213c5a641521ec7890600bffa7f5e1f1ff15cd2477816aec1ba2250bfb40411b181d9e62462b8f11f72a7c1ab973fa2b4d8 SHA512 238fe980ba2de292f82b118caa88b774051492089a70e2a4298084b52b5404079b3a3864084d5bca951c0164378dd23d760d3a8f322652a5d36812e8cf4d50dc
+DIST firefox-66.0.3-nl.xpi 471514 BLAKE2B d52a66a52970990389272a25e0867422b8871ce0776fdf19d0e7015f6d53bd93a719eb9f8da6caffba210b51a28056204512b74a5a42289b72e3c28abf339fa6 SHA512 bbe19a30eb180b8a5114ddf4c34e56c399b7bc64bdbe8d3d6f2ea2ab2abf715c108283b572e471c2d48aa66e8d656279a021cc15e64e37010d265e296ccb8711
+DIST firefox-66.0.3-nn-NO.xpi 477921 BLAKE2B 34d34894ef8aab8c7c484ea8183e8a385d3305c83ab9e10421d689136f544e48ecb37eadb75782765a39e9835b644b3b73bd88bd3f8aa0ecbb5f83442200b63d SHA512 75fef5cfa231c5e469d72590d46a98c8eaba76f2c9c92898a117f9cff59b40757093b424f2ff3c485670bc43e1f722103967328cf7636a0453ac595dc1dbe20c
+DIST firefox-66.0.3-or.xpi 498770 BLAKE2B 8bf9723362649977cc9c60774c643e772f3d6c2cf5dd24eac7b44bda13b8e0a409fd7caaa477edfd4a93ea5516ebd0a67af451921055ece65437f2ca4bd46b78 SHA512 98583e0e449bc510c758d397c1f64efca42877d8d589e80b6186949c6b434e0580149768c3a65b93bef86d44949f43d7bdc5c9de3691af1dbecdd1a4b8005935
+DIST firefox-66.0.3-pa-IN.xpi 534507 BLAKE2B 74a86a01ddcce874069987f14e1946bba75c62eaf53b7814673392890039dd4321cf8165bf862146c285d85121187c76d01519416c6e77cd7abe43982e7999c0 SHA512 99b2066ae8cf53ca2c83c9a1ebe0e141b6761ba9809306f4a1ee8ac93fa6428bb92be1299da74a2f09ee2256aff1d945e8cf03a03384efa2d94634d96ff132a2
+DIST firefox-66.0.3-pl.xpi 464907 BLAKE2B ce0dea4cc3f6fdbbf26b15685ee382ccf4ad0d631f1ef2f1592008483e5c365e42d806a2201d515f7098b413c9d155cb506b877b76a65484e62abd403fd675d2 SHA512 1dabc2f2c4f965cc6cc968e3232edec4118af4c35943a9be5be5a119dec67b3df2769fca293900b3d4a7f558fe9c94b45e1bba40c3e5441d133896bedb6cbc20
+DIST firefox-66.0.3-pt-BR.xpi 480339 BLAKE2B 70288491c0337cf50b245861938a9bc6ba18f3f3377c7a6de359f3174a61532530abde30024ed0be863ec5b8003dec183f4fc500b4c2f55d77dc3edb47994096 SHA512 529c4f74b3bc4b0a3806c63a93dad75649d62122a1cd5eb9887ae043d43ceaf40be365b2a1404430e2976b54879c01419e893e71db17fa2fa6dca3997747e4f0
+DIST firefox-66.0.3-pt-PT.xpi 490008 BLAKE2B db4a5fad1e49455948edab76320b825824fd153d7e6dd6960afc429a94b41af84f4f3874fc3a0bc1a135cf8bc9c08767d62e2db2961c7e6ee65685c546645461 SHA512 134c5346b64cf45648be18e109fe13ff581247b054bbf9d1c8e8ede10f5583ff170e6dba487543b141cc1432692025db83e3110a2f41239cd12ae5b8a8dfe86b
+DIST firefox-66.0.3-rm.xpi 483621 BLAKE2B b38feffebf764cb71d7d4635a5537f9919cac32ebe07e593783e6d949dcb3668f73c9faf1f8ac9c78d948c1c27db33d0b191a1ca68870f5df80de5de044a7c55 SHA512 e619f5120c14a3fd18a89f84c8b765059f8b257acd56f9dbed69653f1b2bcaf63593f0dd1214600175a3ec41b6217e7f5a5ac84d201dccf745af99e5f9a7f266
+DIST firefox-66.0.3-ro.xpi 490270 BLAKE2B 615b75de1b2be41ff3892e9af2fd717d9e1f2589e471e17c0d83f53d311a538180e589457bcd89a65f8fe0fa48c03d319f89dd363dbf1ec9c648350ba4ecf19d SHA512 249672b771480fc2531ae489a38e85efd63c3dd6d78efea589dd39376a962b713b243d28a55fc05d8806dda9f5f7e061a0d4be7cd5317d61cfc2ca791940fa6e
+DIST firefox-66.0.3-ru.xpi 566541 BLAKE2B 179317a7af508c7288e2738fdb71494e433b78c3ef661d7248fc5b5ecc10807a2c083ffee95d27fc44f0849f8acd8b61ca941f2d2dcdacfd8792f5d097209ca6 SHA512 76348e085a9174f42240786a4d164f67f8457e50508c47dfb7f20eb4d97a9fa4498f2b54c99af303f72b3b2ae4f224df608a1e6e5d9c824cd381ad25fce982a3
+DIST firefox-66.0.3-si.xpi 527629 BLAKE2B a1a01f32741561cfed5e7914c9b1eb5376dc926da4fa8d665f1bca8b3ecefaafd99dbf99ef398e8ec44e7a1154bae1bf48a4af23e613450762d9c0f18f11c828 SHA512 1f7861444432e24f4ae107607ba34a6b2921af2a599b041f10e304ecf5754150c35295b4483ad18d7e16be02db114a3ad380b0349ef706b5a7a01d22139dda59
+DIST firefox-66.0.3-sk.xpi 509698 BLAKE2B 5f8973c9bc5cfba3fa4eea432bfdffb17408397d8328a4dd6abc49276682adb2cd389a2799a8307b62718742ad1044ac011416783ad7a58364a6686626811a0f SHA512 f76f7b15009f248b79dd4e7ee9d1c3615c5cd2f60e2cdcaa3e515dfbad2747c208c42827f526300bb4ca8760a800b18a8a3cab4a398085d36159baac8de51a60
+DIST firefox-66.0.3-sl.xpi 483989 BLAKE2B 1bc6bd51347dc440933533c99704b7e10a10d5bc3640f942da17c65f2c56f66e1d2aaadceaabe6809d4e98f6bb605092fd1a7c70ae2fe1d59a06f987563682c1 SHA512 2b3276c077b62c203bbf06483b45452a6012ccd7ec3c8da1e351e86f1ab8e38e93b930c54459c8d29194adfb9901af8986726e931b0b8bf7923e4d0305373554
+DIST firefox-66.0.3-son.xpi 460534 BLAKE2B 57adea01910fe338a57daeb7ae64c762c181c4674f4de7abf52f5fc141070c88410b54bc61da0f0cce74f5b0a5bf5d3906c50fd22e0c73e47fec52d742a54839 SHA512 970482defad3c0f2d703c4bb5b00a54e1306b0449ea04d63cf5b05a38409ab3f6abba4fea8a3e7cfaeafaec483f7180f81f98ea4432c60ef0c2d39b79e7a1dde
+DIST firefox-66.0.3-sq.xpi 501569 BLAKE2B 3529a847a7f5a403b9b910a6c7a332f3674291970eaf9e07056be3095f703da4c07e565ec7ac94400bb47dfa303d5101478ba2067c47a46b90579deff6b5d3c9 SHA512 987c7601fe9f9f0307564f3dfea83a066e07f304d0e373b314f56d7f59083e3284fdc7aa22690cfaadef69ca69c7158809599466369b700d5ef153f8d6e7db18
+DIST firefox-66.0.3-sr.xpi 526763 BLAKE2B 0254a3ab64afab4e1f0e0e4f23f1cf9e022312a08e2fed6e8d92b52e34c0374238ed3ac3c4dcdee694ef29fba79e2868f88ec153706e4254f3ae69cbae88d368 SHA512 3ab11edf3ac1a1a32bf19637dde2c0b1e30263fa2005da00f26ede9f95a090b2e2d6db6a61015af286e63b90a49a5c1857e889140c55c7de269b5a1a35b1ee06
+DIST firefox-66.0.3-sv-SE.xpi 488034 BLAKE2B f4802bed0db4132dd14e2e6f3c14e3aa8799c3c2ff609a6ec03186a5a8f3d52d618b97ea7b5f582a802ad1b8b514fd10e468117c6da7d0a329c517a5c6535886 SHA512 4714ee70e66a910d290e9f04c064c510ef5cf61bdd339a784426b229049fde740e6419ff7703ed82c53a0034198e8e3f1b046536f65342e8df93485f109c0f5e
+DIST firefox-66.0.3-ta.xpi 547841 BLAKE2B ec4a89a7006ccfb495d350a9cd7fcd20cb6839302eccae22146086d20801a8dc5c9afa666daf410a5cbb967d75a249957a7ae739e1b7517baaae8a47f52bb1e7 SHA512 b7f4673e1e7adee539010ce9242bf3c4ebf3033a163e91e7ff4fbe40c08a10e41e4dbbb644c3b8593f79817dfa74e3bb978421cf122ffcd71fba6293ca6e29db
+DIST firefox-66.0.3-te.xpi 554287 BLAKE2B 0779e2c21cb57d367bafd78fb549f8a16c20e7c155728dd5f0b6056571650f85997b1b6099585b8e7fd511775c6614cb11d697cfc2e9e9a7d65358c45805d074 SHA512 6b1e610c7cbe2a3120ab6face7e4236fad9fffff255ffb2c4de1fe73d21dc1b342fb352ad5868d4c77d29c4ed78e3d33af29f6600ced95654ad18ead5afdf408
+DIST firefox-66.0.3-th.xpi 532386 BLAKE2B 3c95c6bb026bade3cbc2f4e91b4f891133248574a082ae46a0be2abcb62a94c317b0302c0023c87d4b37951379f227e34e3fa5796cf6be14e42e7ca0fdc19800 SHA512 bffeddeab272c849116ccdc022fe7145a51c4c93cb4f44148614ad4a077fa550b5b5a3d4fe5f248e68c7557723bf3dda598ec37db1a804132bb7a9ca585cb927
+DIST firefox-66.0.3-tr.xpi 499236 BLAKE2B cce06a6021cb273a318f4310db87817b49b27d4ed5e5b9fba86564b58219d823d594e13059b16dc2650e46cabe26ef5dca346545b460e2be422358621be6200b SHA512 9892a771074a0de434e2ac05b74f98271eff46e81a752b014a9dc50fa3c1a342a85d9c26dad0464eb0a575d9dea35b8d385c6c5eaea79d5c3be5ae0c39b02131
+DIST firefox-66.0.3-uk.xpi 545333 BLAKE2B 33db38a1359a49879fa838446e4676843b6953dbbf2b39523f7fc291016d3b3ad00c445a7de573b514af54df7b722ff2f67a0b2f9f20a98e17d4f6cca36cfcfc SHA512 7427bb37976f84c66ff645341f7f681429e0be38cb26f3bf7440628e506edca4b64f8af78fbe0a729f7527e7c440db42ab04cea3ad678ae871da42664e637a34
+DIST firefox-66.0.3-uz.xpi 481056 BLAKE2B f2c3069696e5ae0333e13e6643ae0902f16bb3c38808d6e6eec068ea433dafa8748667169fda75d708c7c03b20d8fb020288ed943e8f0b46f793f436735258db SHA512 2781762fbda34a06be93dc159feaa0cfb285dab393faa180000b1c1219a2269a378cdac6d2e6cf03ba2f3eea2c32b43eb30bfe382cd741209fb18f21484e46ed
+DIST firefox-66.0.3-vi.xpi 508064 BLAKE2B aabe19f0d9359b02744ee981a0c70d82ba75e79247d9763ee0cbd753a08097f8b4afbe077cd3b26842fd76f76f081dd27536020e9eee1e42062f24cc155671ee SHA512 547789aaf7312a99f9b10e82915fa41c6b4f713fd0c48e32c2585ff19c1ee994e867edb2d4af5fef7f099e6ee2758b8ef180bc151b7407e233991250b87f3194
+DIST firefox-66.0.3-xh.xpi 472377 BLAKE2B 46f6afe58a6ad830552654d1bd94e5407789a6af0432a1830d0b74e6530709bcb4c24221a14e5b593087d009e9f244d4e8e59eb1f4d1fa50ddc0f6d1629b4d0c SHA512 dcfdd5ba2d3e2a5df98d7668df7a3f1c45c4630b8b94f37fd05f4a1ec15bd36e53271e7d09e840d1188a5fe092850c4a6f98e0ab1aa3bed3db3af1ce239d2d2e
+DIST firefox-66.0.3-zh-CN.xpi 519034 BLAKE2B 67c0122f4614a4d2647f72972670e232c291869ecdd3b89ad14f7fe4250fab3ff342bcd48afa016b4b0b8d440a4df039f7c4d88a6bb8a9521e00deba0e0cd281 SHA512 8b7a447ad88700fc39e75921c2054d4cef0ef22f5c6a3dbec7788e0dc9e8938f4fce376faf411609c7ca4681abb637cbe408a32d0757032189b1dae76ee6db96
+DIST firefox-66.0.3-zh-TW.xpi 516718 BLAKE2B 6bf878dfaa99e56b5ee85415eab63d8049779b2564a001540b08dc896b86fa176e88caf5133d8d8a48fc5416e4e5179ab00de64d6a9bdfc53163acddd766256b SHA512 a4c199567dead9729f23b54bdd26fdc4a02ad4283d9aa376338b03d37bda2323eecc8be630974d55b0f174a9b2ed0b5ac66b26ad10be193832139800eb83f2ea
+DIST firefox-66.0.3.source.tar.xz 281164936 BLAKE2B 9884009054ec1d6ab3e1da298694b4b432f085de6b9c63e97c69fa4dd0b3a3842fd5510819a09d2ba0e860c2e89929de9b234cc98fd00ca1b9a5fe714fadaf49 SHA512 e857408ffa4acb8676fe3f40cbbdf6c8f0913c6392568cdea8783a94140a4fdff95d117d1a1bfe890097833230b72729f58cdb1df2b552533bb21bd1fe7d77c3
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
-EBUILD firefox-60.6.1.ebuild 13644 BLAKE2B 313bbc61e89d1b7b42c2a977c309711e8742e0c15704325725984d01f6c1f74d69b46adb88bee08cc78f2c93a2e53cca23ec38fdd5847bc4e45141df4611189a SHA512 bd141bc5e5be09a7096b8eae272a2e411ebb3dcf22c496c012da61c7d01eefc4e4dcdf3f8be2a8e62f6680644e5311cad2eaa96c0d1fc0a306fffb3a8910b9ed
-EBUILD firefox-66.0.2.ebuild 24349 BLAKE2B 6888769e6e45519cbe6a99afab3f3524ee0c01bf971a1ceeaf7a37c6c17b0b241fd1373838d2d390dfc61c57fba4ddd44c2245cc4b991e3142caf27da5a98b33 SHA512 900b0cba8fbf560c155cd3f489782c740c7b73081319d35c7e7d6e08477ea91072161867c9b4e700e3a099a5cdbf1c6770bb8d617fd2c4118d98b3deb54bb38c
+EBUILD firefox-60.6.1.ebuild 13651 BLAKE2B 637e53a897457188eb64bf49520e500a7bb7aee7503fad9ad1d9d9bbc459239f58706f2c8163bf719b95a939711542fdbefbd41cd1cfb6bd3eb26da3de651a02 SHA512 0b0b9022a301a8c4400314109c2a217f151eac5f6f10b9abfe05ece22f9191631e9579a4a6dbff11c7e66b53c84d59db8c70990cd1c39f643c341b969c71d423
+EBUILD firefox-66.0.3.ebuild 24349 BLAKE2B 6888769e6e45519cbe6a99afab3f3524ee0c01bf971a1ceeaf7a37c6c17b0b241fd1373838d2d390dfc61c57fba4ddd44c2245cc4b991e3142caf27da5a98b33 SHA512 900b0cba8fbf560c155cd3f489782c740c7b73081319d35c7e7d6e08477ea91072161867c9b4e700e3a099a5cdbf1c6770bb8d617fd2c4118d98b3deb54bb38c
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/firefox-60.6.1.ebuild b/www-client/firefox/firefox-60.6.1.ebuild
index f538ffc7825e..99ca68319e85 100644
--- a/www-client/firefox/firefox-60.6.1.ebuild
+++ b/www-client/firefox/firefox-60.6.1.ebuild
@@ -40,7 +40,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/firefox/firefox-66.0.2.ebuild b/www-client/firefox/firefox-66.0.3.ebuild
similarity index 100%
rename from www-client/firefox/firefox-66.0.2.ebuild
rename to www-client/firefox/firefox-66.0.3.ebuild
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 581e7fa6a0e3..e5fe23efee21 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_74.0.3729.40-1_amd64.deb 59919032 BLAKE2B dba7bac203e89c99a1c37b3ce5d5228538d1caaf77c649406f31fbf937129328bc520951cc72f295e14dc80fdc7ed2db367c1a7174b9fc8fc3279d171b8609d4 SHA512 37cbe63d0106024a310042325fe78ad2c40f50455302dded475db6315ed66c6dc89c93e2e06481f1b940419db782664fceabea81c87630fc3f500fce9a9df04b
-EBUILD google-chrome-beta-74.0.3729.40.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-beta_74.0.3729.75-1_amd64.deb 59498310 BLAKE2B d5d078ed078f93b94ad4915c76d35e41f0d3512829dfa5be4835cb995a0109b26fe5d041ed3f4cef9714fc49e0c670bbf5c3a3015a74cd68d76a509c47fbfa78 SHA512 cb03b85d8041b4cd577a384efdbcc00fd1c9c839f6776c3b2534008b384c163e183e2a3e1d77cd34b193f24793a342ec789ba376100c8981b4ba98ddb87ffd99
+EBUILD google-chrome-beta-74.0.3729.75.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-74.0.3729.40.ebuild b/www-client/google-chrome-beta/google-chrome-beta-74.0.3729.75.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-74.0.3729.40.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-74.0.3729.75.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index a68b91330a96..084645912c1c 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_75.0.3745.4-1_amd64.deb 60051310 BLAKE2B f44beaedad5a28f36ed19cdf142b982ab129c3bbcb650e05c5d13b69dba8661fc6b9ba59d4a2294c548356678a70204c56bb810a23c135c952048df0ad94e0f1 SHA512 af5c99821b3eb8c92edd4827e8ec81ae7ce6e3df029b4c14e3e11978aa162e3b00919ff7a3d81ef63409614ae191a48f790a7f4cf567ef4258cf74a8f95b2d18
-EBUILD google-chrome-unstable-75.0.3745.4.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-unstable_75.0.3759.4-1_amd64.deb 60072262 BLAKE2B d66269dca89ebbff0ae86c7d02f524050d31ac0e4be50a477e55d18dd5ccc2cb092b0808e89fe4e18ff951ffceceb9202536b5bdf32c15e691e2ed309c075d4b SHA512 a806d3b0918f879829da070d8a5216fb7711f902eff141287c6a82db7de908546bc32f886ce6a8e38fbc9e3ae4fbeb38c0245d4c15b8953472a608d8328bdc69
+EBUILD google-chrome-unstable-75.0.3759.4.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-75.0.3745.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-75.0.3759.4.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-75.0.3745.4.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-75.0.3759.4.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index b62d02ff6d2f..5ab081bb101c 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_73.0.3683.86-1_amd64.deb 57596330 BLAKE2B 5bd808a2909d74e85056fe9c84c746463ee9dc2a31bf3e2f95364885acac6c14d41433fee2922b6e2a33b1aebb8a63a6319e28dabf759231493e1edce5b2a1f9 SHA512 b7bb3f1c1d76ec029f3d9d2387ff2218ea114ea43047c313f930811ff5a4214ea00a651b8891170845f6c4a03edc44ffb7f04450b25579ece11517e7e0a2de6f
-EBUILD google-chrome-73.0.3683.86.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-stable_73.0.3683.103-1_amd64.deb 57642824 BLAKE2B b1df10d4367d23ef075005c6496655d38da8c013e1f860289b7be19260ca56d6d49153fb239c0781e7babc46138653493722d4badca023ee14e07e8d7afc2fed SHA512 19a1719ef9b1946401749f0ede6ee381ecbdeeb3e03afa474fd3122de6e6a5db983c24af18c81d135d703bd30b95673dc277c64fc19127b02ce64f795fc79cd1
+EBUILD google-chrome-73.0.3683.103.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-73.0.3683.86.ebuild b/www-client/google-chrome/google-chrome-73.0.3683.103.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-73.0.3683.86.ebuild
rename to www-client/google-chrome/google-chrome-73.0.3683.103.ebuild
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index c5d98d0a7b72..7af75e4b73db 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -10,4 +10,5 @@ DIST w3mmee-p24-22.tar.gz 690094 BLAKE2B 9b779122a10f606fab8cfe9e3ffde7473f60ee6
 DIST w3mmee-p24-23.tar.gz 697342 BLAKE2B cdfd5752a29ee486ccb4cb174ac68aa2b93c818a088e28a8938ef308030b4baac69645e5adcf86361297f79b2473de483917f523bdd0cda0f6d0d93cc0755534 SHA512 fa74b9124e0790461ea7936411f89265c8a367326bf1bba7a5ea5f4abf748197e0926847f9860ec8d35e97f0e53bcdc69821fdd9d741fc8b18b5e11211aa3271
 EBUILD w3mmee-0.3.2_p24-r10.ebuild 3831 BLAKE2B 7fc6f1094f012938a8d69f95bedcb03636247fca6b22526dc530e272b21e6845c75e3f4eed9e72ff6353d8a982bc70d5ab41daeb70b9e128a9e59a86a0f4b884 SHA512 7a622fa47ccab3f458424da26374ec12493494b12ed61e2e9fde3f128e97e693f3b5a2446b15fdae9f7f7ff62a6e3e15b6ae71744ecc619a5f416c68123c01b5
 EBUILD w3mmee-0.3.2_p24-r11.ebuild 3834 BLAKE2B cd439d7e32a103a4ee7dd119cc909f8d00e219641b71f7464050f389e07f19739113c5d16bf7d6d6137234eb107496d22d3e237941ea4eed86ca1fc7fbeed49b SHA512 ca639a7d84a2764f6dd3a33b5ce5b753a68f0f8da068b6640b368c7cd3a4911c8f6b0832077dc050bcadeece30cc2a606b7ae5e1b2622a2966dc3200cc820e31
+EBUILD w3mmee-0.3.2_p24-r12.ebuild 3642 BLAKE2B f8f0aaa05fa3989ead7b0b47f872cdb2375b5b8e323cc7c1526ec8c6ebbecf2b1fac74da5f6c97f2318081ac0278da277fc10335fa14f69165cc6ac455e66738 SHA512 927eefb8857454ffe7bdcd2309d109ad80d431f5978853ae90cb824fc873856c9b061c257aca51efd840b4eae7bb821885c87b8848b08fb500d96c7e84b1e948
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
new file mode 100644
index 000000000000..839f8427a0f0
--- /dev/null
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit alternatives multilib toolchain-funcs
+
+MY_PV="${PV##*_}-23"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A variant of w3m with support for multiple character encodings"
+HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"
+SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gpm libressl nls ssl"
+
+DEPEND=">=dev-libs/boehm-gc-7.2
+	dev-libs/libmoe
+	dev-lang/perl
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	gpm? ( sys-libs/gpm )
+	nls? ( sys-devel/gettext )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-boehm-gc.patch
+	"${FILESDIR}"/${PN}-gcc-4.4.patch
+	"${FILESDIR}"/${PN}-gcc-4.5.patch
+	"${FILESDIR}"/${PN}-glibc-2.14.patch
+	"${FILESDIR}"/${PN}-rc_name.patch
+	"${FILESDIR}"/${PN}-time.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-w3mman.patch
+)
+DOCS=( ChangeLog NEWS{,.mee} README )
+HTML_DOCS=( 00INCOMPATIBLE.html )
+
+src_prepare() {
+	default
+
+	sed -i "s:/lib\([^a-z$]\):/$(get_libdir)\1:g" configure
+	sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile
+}
+
+src_configure() {
+	local myconf=(
+		-locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)')
+	)
+	local myuse=(
+		display_code=E
+		system_code=E
+		use_ansi_color=y
+		use_cookie=y
+		use_history=y
+		use_mouse=$(usex gpm y n)
+	)
+
+	if use ssl; then
+		myconf+=(
+			--ssl-includedir="${EPREFIX}/usr/include/openssl"
+			--ssl-libdir="${EPREFIX}/usr/$(get_libdir)"
+		)
+		myuse+=(
+			use_digest_auth=y
+			use_ssl=y
+			use_ssl_verify=y
+		)
+	else
+		myuse+=( use_ssl=n )
+	fi
+	# Obsolete imlib-1 disabled, bug #678910
+	myuse+=( use_image=n )
+
+	cat <<-EOF >> config.param
+	lang=MANY
+	accept_lang=en
+	EOF
+
+	env CC=$(tc-getCC) "${myuse[@]}" ./configure \
+		-nonstop \
+		-prefix="${EPREFIX}/usr" \
+		-suffix=mee \
+		-auxbindir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		-libdir="${EPREFIX}/usr/$(get_libdir)/${PN}/cgi-bin" \
+		-helpdir="${EPREFIX}/usr/share/${PN}" \
+		-mandir="${EPREFIX}/usr/share/man" \
+		-sysconfdir="${EPREFIX}/etc/${PN}" \
+		-model=custom \
+		-libmoe="${EPREFIX}/usr/$(get_libdir)" \
+		-mb_h="${EPREFIX}/usr/include/moe" \
+		-mk_btri="${EPREFIX}/usr/libexec/moe" \
+		-cflags="${CFLAGS}" \
+		-ldflags="${LDFLAGS}" \
+		"${myconf[@]}" \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# w3mman and manpages conflict with those from w3m
+	mv "${ED}"/usr/share/man/man1/w3m{,mee}.1 || die
+	mv "${ED}"/usr/share/man/ja/man1/w3m{,mee}.1 || die
+
+	docinto html/en
+	dodoc doc/*.html
+	rm -f doc/*.html
+	docinto en
+	dodoc doc/{HISTORY,README,keymap,menu}*
+
+	docinto html/ja
+	dodoc doc-jp/*.html
+	rm -f doc-jp/*.html
+	docinto ja
+	dodoc doc-jp/{HISTORY,README,keymap,menu}*
+}
+
+pkg_postinst() {
+	w3m_alternatives
+	einfo
+	einfo "If you want to render multilingual text, please refer to"
+	einfo "/usr/share/doc/${PF}/en/README.mee or"
+	einfo "/usr/share/doc/${PF}/jp/README.mee"
+	einfo "and set W3MLANG variable respectively."
+	einfo
+}
+
+pkg_postrm() {
+	w3m_alternatives
+}
+
+w3m_alternatives() {
+	if [[ ! -f /usr/bin/w3m ]]; then
+		alternatives_makesym /usr/bin/w3m \
+			/usr/bin/w3m{m17n,mee}
+		alternatives_makesym /usr/bin/w3mman \
+			/usr/bin/w3m{man-m17n,meeman}
+		alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \
+			/usr/share/man/ja/man1/w3m{m17n,mee}.1.gz
+		alternatives_makesym /usr/share/man/man1/w3m.1.gz \
+			/usr/share/man/man1/w3m{m17n,mee}.1.gz
+		alternatives_makesym /usr/share/man/man1/w3mman.1.gz \
+			/usr/share/man/man1/w3m{man-m17n,meeman}.1.gz
+	fi
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 7f9b5d6ab822..fb00d4eda6d5 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 60a92d4ae1af..817927e7dc63 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_74.0.3729.40-1_amd64.deb 59919032 BLAKE2B dba7bac203e89c99a1c37b3ce5d5228538d1caaf77c649406f31fbf937129328bc520951cc72f295e14dc80fdc7ed2db367c1a7174b9fc8fc3279d171b8609d4 SHA512 37cbe63d0106024a310042325fe78ad2c40f50455302dded475db6315ed66c6dc89c93e2e06481f1b940419db782664fceabea81c87630fc3f500fce9a9df04b
-DIST google-chrome-stable_73.0.3683.86-1_amd64.deb 57596330 BLAKE2B 5bd808a2909d74e85056fe9c84c746463ee9dc2a31bf3e2f95364885acac6c14d41433fee2922b6e2a33b1aebb8a63a6319e28dabf759231493e1edce5b2a1f9 SHA512 b7bb3f1c1d76ec029f3d9d2387ff2218ea114ea43047c313f930811ff5a4214ea00a651b8891170845f6c4a03edc44ffb7f04450b25579ece11517e7e0a2de6f
-DIST google-chrome-unstable_75.0.3745.4-1_amd64.deb 60051310 BLAKE2B f44beaedad5a28f36ed19cdf142b982ab129c3bbcb650e05c5d13b69dba8661fc6b9ba59d4a2294c548356678a70204c56bb810a23c135c952048df0ad94e0f1 SHA512 af5c99821b3eb8c92edd4827e8ec81ae7ce6e3df029b4c14e3e11978aa162e3b00919ff7a3d81ef63409614ae191a48f790a7f4cf567ef4258cf74a8f95b2d18
-EBUILD chrome-binary-plugins-73.0.3683.86.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-74.0.3729.40_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
-EBUILD chrome-binary-plugins-75.0.3745.4_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+DIST google-chrome-beta_74.0.3729.75-1_amd64.deb 59498310 BLAKE2B d5d078ed078f93b94ad4915c76d35e41f0d3512829dfa5be4835cb995a0109b26fe5d041ed3f4cef9714fc49e0c670bbf5c3a3015a74cd68d76a509c47fbfa78 SHA512 cb03b85d8041b4cd577a384efdbcc00fd1c9c839f6776c3b2534008b384c163e183e2a3e1d77cd34b193f24793a342ec789ba376100c8981b4ba98ddb87ffd99
+DIST google-chrome-stable_73.0.3683.103-1_amd64.deb 57642824 BLAKE2B b1df10d4367d23ef075005c6496655d38da8c013e1f860289b7be19260ca56d6d49153fb239c0781e7babc46138653493722d4badca023ee14e07e8d7afc2fed SHA512 19a1719ef9b1946401749f0ede6ee381ecbdeeb3e03afa474fd3122de6e6a5db983c24af18c81d135d703bd30b95673dc277c64fc19127b02ce64f795fc79cd1
+DIST google-chrome-unstable_75.0.3759.4-1_amd64.deb 60072262 BLAKE2B d66269dca89ebbff0ae86c7d02f524050d31ac0e4be50a477e55d18dd5ccc2cb092b0808e89fe4e18ff951ffceceb9202536b5bdf32c15e691e2ed309c075d4b SHA512 a806d3b0918f879829da070d8a5216fb7711f902eff141287c6a82db7de908546bc32f886ce6a8e38fbc9e3ae4fbeb38c0245d4c15b8953472a608d8328bdc69
+EBUILD chrome-binary-plugins-73.0.3683.103.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
+EBUILD chrome-binary-plugins-74.0.3729.75_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+EBUILD chrome-binary-plugins-75.0.3759.4_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.86.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.103.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.86.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.103.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.40_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.75_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.40_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-74.0.3729.75_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3745.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3759.4_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3745.4_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-75.0.3759.4_alpha.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 302576364b6d..fd9c8cc322ae 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 693abcbc78c3..19a4368472fc 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 743 BLAKE2B 3712991b9d8cecf44be34be3124897815a995b2c8bf4aa29d9881001a847d8ed0e42bb3732b839a4f3cfa6826d651395ab53bc047dfd1d42756eb508e061e1e3 SHA512 96183c10e6218bd56b56e2545344a4b2fa7179b7c1983f91760f2dfec0e5834d043d44845234ce42a146e972384622a926c18bbfa3185eeac135a90527e41087
+EBUILD neXtaw-0.15.1-r3.ebuild 739 BLAKE2B a7e92358f276f85a740067483cf8564fbb53a5992db8edab7da434ebfc9d9a78857c2ed5954c338e11fa505015b952108986680f73eaa741b4ec3d45bbe3fc15 SHA512 117919d141a9745d2e1c37c912990b2c4896bb22a83886424efaad74a1ab11c79c0740b386f7a6875299fe3a4e1f9ab74f373921eaae70ee88cad50f7f9a8f76
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 5c20aa1d5f06..158f386e9c36 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index a2acd1d0f2c3..c56a04477f0b 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,8 +1,6 @@
 DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
-DIST pixman-0.38.0.tar.gz 891291 BLAKE2B 8d057fba6d85ab4d2bb83903e8f1a6ac05659be4d0645782f5cf4c190e7b27fa0e7d6b2718ab111bd8ded9b617c7aad42dbfdf2169d49816b7eaf6e6673c6a5f SHA512 1b0205dbe9d9185c68813ce577a889f3c83e83fbd9955c3a72d411c3b476e6be93fc246b5b6ef4ee17e2bb8eb6fb5559e01dff7feb6a6c4c6314f980e960d690
-DIST pixman-0.38.2.tar.gz 897487 BLAKE2B 0e1dbd24d5510687ac17f15c32fb271c33e9c3f652e689d9ba2a01c9c806696e2020a94fa4fc0892f5b44e2f4b8cd1539142ce443b43d19f9155415033ce75ea SHA512 e809b7bcc81f53067dc70fceb1b8809d3b6b7166b9689ed4e9455f1eb94d61d90cc236aac19e330851f52c074e26a74a5c402a3bbcdef41fd3b6aebc57150539
+DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 EBUILD pixman-0.36.0.ebuild 1011 BLAKE2B 39bdaceeb38639ce856d207792a88ee7f1237cb2b0ac8ca34d93503f3ce3b69146ea015657e7a9b55481f59a438d29ba491711716d7820ede4620d9dc56e7118 SHA512 034b0716e27095c89beeaa0bfcc12032a1d629800d91b308fea8de21e5c1f369fdf62d1ab14188126c8eaf7b3f802d5e007cf1fd7e0b0f1e5cf9f7673c5e8978
-EBUILD pixman-0.38.0.ebuild 1536 BLAKE2B b989e0b34a2592b748f15bd845f6b4a2c0ef5e57d0a2dd47b89ff4681a5661d3aab185d02d5112e5408843022997f474611e6536f0611ac064ee5c6d305c664e SHA512 242b48a9e2f4d56309b2aaf08d4e91b91b5c4efaa235dfba0292fc591bfbadfe12b5f6bc1fe91f6a83d845d5339b943381aeefec1aa760826ea2265ef1a72e13
-EBUILD pixman-0.38.2.ebuild 1631 BLAKE2B 9d7f4de4ba2af8d0f5ab6b6e1112380897e82ad46bf8ba8345ccb5cfe8007a307b1ec7cb4550a220bfaa3332ea90122a29f0eb95e66dfee9aa70c668b2a5e0a9 SHA512 005dd50814a4f8d6ddfa399f573ca92f3e7825f2ad02f3a8e6950353b532aa5c21063568ddd5bb0713bbb6cffda6a9e0ecf4a308068ed4e1126fa9ec377a626f
+EBUILD pixman-0.38.4.ebuild 1631 BLAKE2B 9d7f4de4ba2af8d0f5ab6b6e1112380897e82ad46bf8ba8345ccb5cfe8007a307b1ec7cb4550a220bfaa3332ea90122a29f0eb95e66dfee9aa70c668b2a5e0a9 SHA512 005dd50814a4f8d6ddfa399f573ca92f3e7825f2ad02f3a8e6950353b532aa5c21063568ddd5bb0713bbb6cffda6a9e0ecf4a308068ed4e1126fa9ec377a626f
 EBUILD pixman-9999.ebuild 1631 BLAKE2B 9d7f4de4ba2af8d0f5ab6b6e1112380897e82ad46bf8ba8345ccb5cfe8007a307b1ec7cb4550a220bfaa3332ea90122a29f0eb95e66dfee9aa70c668b2a5e0a9 SHA512 005dd50814a4f8d6ddfa399f573ca92f3e7825f2ad02f3a8e6950353b532aa5c21063568ddd5bb0713bbb6cffda6a9e0ecf4a308068ed4e1126fa9ec377a626f
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.0.ebuild b/x11-libs/pixman/pixman-0.38.0.ebuild
deleted file mode 100644
index 9af2c222cf3f..000000000000
--- a/x11-libs/pixman/pixman-0.38.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
-		$(meson_feature cpu_flags_x86_mmxext mmx)
-		$(meson_feature cpu_flags_x86_sse2 sse2)
-		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature altivec vmx)
-		$(meson_feature neon neon)
-		$(meson_feature loongson2f loongson-mmi)
-		-Dgtk=disabled
-		-Dlibpng=disabled
-		-Dopenmp=auto # only used in unit tests
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/pixman/pixman-0.38.2.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
similarity index 100%
rename from x11-libs/pixman/pixman-0.38.2.ebuild
rename to x11-libs/pixman/pixman-0.38.4.ebuild
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index dfd6ce74fb6e..7419a1f0619a 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 1d2876dc2785..e187e77c6996 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -10,6 +10,6 @@ DIST rxvt-unicode-9.21.tar.bz2 925293 BLAKE2B 3da715f5f7726e6dfd5199b7fbc30efa50
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
 EBUILD rxvt-unicode-9.21.ebuild 3870 BLAKE2B e36fd0c466fd3d9f0fdeb35de756074e2ba249eb192f516aa250105232e4ff4908614c6cdaefae71dd1b27b1d83a5dba3ff7efdad9834ee0e833f7bb05c17a74 SHA512 0f90e5e980f1c06811665861c7bda923906918d0639cbf5e06ebf9fcab27a6313c78af62be89ab0fc06bf1c5ebac8c2d957150aee1c1410e159e64a76ee12ca5
 EBUILD rxvt-unicode-9.22-r1.ebuild 2051 BLAKE2B 58eb15f962f73d0c388cc37345e59ec91dda6639f892b29af04f288c8b51060fc3355457ae55e3b8e561294c10a6842e24ed477c29a982823eea7632e82304f5 SHA512 7675fcfcea6d288d85c6e3091da99c7de2b63f84b9a658ded92b104f2e6e8f00d037e6269d5be93f30e902db5059fe61618a40fadf06d7942317a209a9be19e9
-EBUILD rxvt-unicode-9.22.ebuild 3881 BLAKE2B 70fd1e92677f7ce0b9ef837ce52fb3923f96813aa3f7f77a7df58b6d0f54369fc61dbf6c42f1e68fadd29894f94c9b764a6bd11bec84c4aa48303191aa2064db SHA512 fa82ae217561c1531a5baed290a35c9f603c04c316c21c151148b51ee0c76fc075250ef66e3a0d55e0992e4748d3051ad56322b4280d2cacb36aec8348de191f
-EBUILD rxvt-unicode-9999.ebuild 2018 BLAKE2B 4d46a3b5b0cfac49c3bd7b0241f6d79311a6a764b4a12071b005922a357bdf2888ce2bd5c086b22374012403b36455b931d4c8e32426daad5127743d46f016bb SHA512 231eb63904608786eca6677f035b226a6a85030b4ea490d4c1de903ff67b8a032bcdd158f472118d6f2c73be64f8db02d7341e1c74f75e94df02fcd999ff16fb
-MISC metadata.xml 1603 BLAKE2B 1dc70c8516630ed93fd431eadf814aa1a39cfaf00d02a8e6ce710ae673b6925e34f0ec468089f42cfa2651aa1c6a4a1fa6782da52ba6cb20a9f630105bc09163 SHA512 26bf3b229ba3ec60ee18779d8b4a67f23c8cc7358687adf1434fb3b9d4807187d22514467ce3cfeee1d82c925418b2e2f6efde691109897cd7d5b401b9e1d979
+EBUILD rxvt-unicode-9.22-r2.ebuild 2138 BLAKE2B cf9b21791484656861ea9cabfffcded6000ff482a8ef7fd52141e1ec9e870fa75f96ec0273bd4c9d015ccc4bc6954fbcd7b84d8902e5b984a96db221c2332369 SHA512 fe720d5f469da01be828438d710538894ea9f99892a6e803bff6b883c5abb3c8ef09606b2d60170ee044f6e9d4d1d37c936be97f0ee1ce198f784e2868f2f261
+EBUILD rxvt-unicode-9999.ebuild 2067 BLAKE2B 877b9a40a2f8b83a1ae1915f628a00468f683594abccef279c0aaae668e46776353db0bfbac5ef861563d986e8ba39d3c77681a928587e0af5076e0b2df7735e SHA512 0a60ee362c50f2408f1440faed40df4a59f916424cdf6b87a928989ab6533d7f4b1866d4466f7f360ed5fd6497e7b1a79a2ac4a4e6f4ff0ff0d77e65020016ac
+MISC metadata.xml 1653 BLAKE2B 362a4497375c697edefa39b3a0c318248e8d99a0e37fc2833019d90c748ae5e43c8010be4554524fdaebd76f6370a74d0eb45aa919341381b7db281140ab0c5d SHA512 040d5261257be8e56bed24b5474463114f456bb1951e8772c1e27a3fecaa71d8806e7f1534e10fd11f2277709e0efe97f95079b4db8ce5e06c8ee457540b4806
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 7d1c93339ec7..fe671825fc57 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<use>
-		<flag name="256-color">Enable 256 color support</flag>
-		<flag name="alt-font-width">Calculate the font width using a different method</flag>
-		<flag name="blink">Enable blinking text</flag>
-		<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l.
-	Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
-		<flag name="fading-colors">Enable colors fading when off focus</flag>
-		<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
-		<flag name="font-styles">Enable support for bold and italic fonts</flag>
-		<flag name="iso14755">Enable ISO-14755 support</flag>
-		<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
-		<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
-		<flag name="pixbuf">Enable transparency support using gtk's pixbuf</flag>
-		<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt).
-	Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
-		<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
-		<flag name="wcwidth">Enable wide char width support</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
-	</upstream>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<use>
+<flag name="256-color">Enable 256 color support</flag>
+<flag name="alt-font-width">Calculate the font width using a different method</flag>
+<flag name="blink">Enable blinking text</flag>
+<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l.  Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
+<flag name="fading-colors">Enable colors fading when off focus</flag>
+<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
+<flag name="font-styles">Enable support for bold and italic fonts</flag>
+<flag name="iso14755">Enable ISO-14755 support</flag>
+<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
+<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
+<flag name="pixbuf">Enable transparency support using gtk's pixbuf</flag>
+<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt).  Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
+<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
+<flag name="utmp">Enable utmp support</flag>
+<flag name="wcwidth">Enable wide char width support</flag>
+<flag name="wtmp">Enable wtmp support</flag>
+</use>
+<upstream>
+<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r2.ebuild
new file mode 100644
index 000000000000..ffbed292e804
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="
+	256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
+	pixbuf startup-notification unicode3 +utmp +wtmp xft
+"
+RESTRICT="test"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.7-r6:=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
+	perl? ( dev-lang/perl:= )
+	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+	startup-notification? ( x11-libs/startup-notification )
+	xft? ( x11-libs/libXft )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
+)
+DOCS=(
+	Changes
+	README.FAQ
+	doc/README.xvt
+	doc/changes.txt
+	doc/etc/${PN}.term{cap,info}
+	doc/rxvt-tabbed
+)
+
+src_prepare() {
+	default
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-everything goes first: the order of the arguments matters
+	econf --enable-everything \
+		$(use_enable 256-color) \
+		$(use_enable blink text-blink) \
+		$(use_enable fading-colors fading) \
+		$(use_enable font-styles) \
+		$(use_enable iso14755) \
+		$(use_enable mousewheel) \
+		$(use_enable perl) \
+		$(use_enable pixbuf) \
+		$(use_enable startup-notification) \
+		$(use_enable unicode3) \
+		$(use_enable utmp) \
+		$(use_enable wtmp) \
+		$(use_enable xft)
+}
+
+src_compile() {
+	default
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die
+}
+
+src_install() {
+	default
+
+	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
+		"System;TerminalEmulator"
+}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
deleted file mode 100644
index e60a08adddf4..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="rxvt clone with xft and unicode support"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="
-	256-color alt-font-width blink buffer-on-clear +focused-urgency
-	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
-	startup-notification xft unicode3 +vanilla wcwidth
-"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r6:=
-	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
-	media-libs/fontconfig
-	perl? ( dev-lang/perl:= )
-	pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-	startup-notification? ( x11-libs/startup-notification )
-	x11-libs/libX11
-	x11-libs/libXrender
-	xft? ( x11-libs/libXft )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-RESTRICT="test"
-REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secondary-wheel !wcwidth )"
-
-src_prepare() {
-	# fix for prefix not installing properly
-	epatch \
-		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
-		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-
-	if ! use vanilla; then
-		ewarn "You are going to include unsupported third-party bug fixes/features."
-		ewarn "If you want even more control over patches, then set USE=vanilla"
-		ewarn "and store your patch set in /etc/portage/patches/${CATEGORY}/${PF}/"
-
-		use wcwidth && epatch doc/wcwidth.patch
-
-		# bug #240165
-		use focused-urgency || epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
-
-		# bug #263638
-		epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
-
-		# bug #237271
-		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
-
-		# support for wheel scrolling on secondary screens
-		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
-
-		# ctrl-l buffer fix
-		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch
-
-		use alt-font-width && epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
-	fi
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-
-	econf --enable-everything \
-		$(use_enable 256-color) \
-		$(use_enable blink text-blink) \
-		$(use_enable fading-colors fading) \
-		$(use_enable font-styles) \
-		$(use_enable mousewheel) \
-		$(use_enable perl) \
-		$(use_enable pixbuf) \
-		$(use_enable startup-notification) \
-		$(use_enable xft) \
-		$(use_enable unicode3) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	sed -i \
-		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
-		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
-}
-
-src_install() {
-	default
-
-	dodoc \
-		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
-
-	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
-		"System;TerminalEmulator"
-}
-
-pkg_postinst() {
-	if use buffer-on-clear; then
-		ewarn "You have enabled the buffer-on-clear USE flag."
-		ewarn "Please note that, although this works well for most prompts,"
-		ewarn "there have been cases with fancy prompts, like bug #397829,"
-		ewarn "where it caused issues. Proceed with caution."
-		ewarn "  (keep this terminal open until you make sure it works)"
-	fi
-	if use secondary-wheel; then
-		elog "You have enabled the secondary-wheel USE flag."
-		elog "This allows you to scroll in secondary screens"
-		elog "(like mutt's message list/view or nano) using the mouse wheel."
-		elog
-		elog "To actually enable the feature you have to add"
-		elog "  URxvt*secondaryWheel: true"
-		elog "in your ~/.Xdefaults file"
-	fi
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
index 9a25833630ec..376b8036d825 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools cvs eutils
+EAPI=7
+inherit autotools cvs desktop vcs-clean
 
 DESCRIPTION="rxvt clone with xft and unicode support"
 HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -15,13 +15,13 @@ SLOT="0"
 KEYWORDS=""
 IUSE="
 	256-color blink fading-colors +font-styles iso14755 +mousewheel +perl
-	pixbuf startup-notification xft unicode3
+	pixbuf startup-notification unicode3 +utmp +wtmp xft
 "
 RESTRICT="test"
 
 RDEPEND="
+	>=sys-libs/ncurses-5.7-r6:=
 	media-libs/fontconfig
-	sys-libs/ncurses:*
 	x11-libs/libX11
 	x11-libs/libXrender
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
@@ -35,30 +35,31 @@ DEPEND="
 	virtual/pkgconfig
 	x11-base/xorg-proto
 "
-
-S=${WORKDIR}/${PN}
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
-	"${FILESDIR}"/${PN}-9.21-xsubpp.patch
-
+DOCS=(
+	Changes
+	README.FAQ
+	doc/README.xvt
+	doc/changes.txt
+	doc/etc/${PN}.term{cap,info}
+	doc/rxvt-tabbed
 )
+S=${WORKDIR}/${PN}
 
 src_prepare() {
 	ecvs_clean
-
-	# kill the rxvt-unicode terminfo file - #192083
-	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die
+	eapply \
+		"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
+		"${FILESDIR}"/${PN}-9.21-xsubpp.patch
 
 	eapply_user
 
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed"
+
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-
 	# --enable-everything goes first: the order of the arguments matters
 	econf --enable-everything \
 		$(use_enable 256-color) \
@@ -71,6 +72,8 @@ src_configure() {
 		$(use_enable pixbuf) \
 		$(use_enable startup-notification) \
 		$(use_enable unicode3) \
+		$(use_enable utmp) \
+		$(use_enable wtmp) \
 		$(use_enable xft)
 }
 
@@ -85,9 +88,6 @@ src_compile() {
 src_install() {
 	default
 
-	dodoc \
-		README.FAQ Changes doc/README* doc/changes.txt doc/etc/* doc/rxvt-tabbed
-
 	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
 		"System;TerminalEmulator"
 }
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index e55a33793c3d..75c2c7890ea7 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 1c19d9da5a2c..b44b44dcb362 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,6 +1,8 @@
+AUX xfwm4-4.13.1-fix-mask-len.patch 871 BLAKE2B 048bbabfa59671a5e0dba77e353a8daed8677839b82de6e4a9b0419217bc3d91baac8ccd7c8129aa907de4396014503947501a3cb0c12f44ed96795337ff548d SHA512 beb34642c63f1dc1734261039a00ea6e845c0b544c655633096027ad627b003fac221b74345150aac92854416bae054c3bb4efcce195026432061610480500ad
 DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
 DIST xfwm4-4.13.1-patchset.tar.bz2 2739 BLAKE2B 895ac4939c9f9ab75e7f9e5b237cc731dd619bc87ac7a4f6623dc30ef5f4b7e0a80c826881a430b9c1d42ae0172fb72af2d4ff7c5ad6b54890f6d9233c4ecf49 SHA512 aa918e8efb050b87afb90594cfeb69a4457117b6bd47142d16f3cdf3d1cd7a4d9d2670dbbb68d939f5d2e52a05b42cefb59325963aabad84fd82ddf1f6ffd6f5
 DIST xfwm4-4.13.1.tar.bz2 1224120 BLAKE2B 983b12775ba8998598efb22a2a7ab6f539cb1c6074c3fbaa882b9627e5ad0ff3b96ed0d4352c31dd04451c37dd706404147b87bd899f6b6f1b38df0162b82a15 SHA512 2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320
 EBUILD xfwm4-4.12.5.ebuild 1548 BLAKE2B bcad70f5676a341ada91eb817f59a5dfe1cf1f071ee2f767ba9e499e107c9c57f89ff138b6cdc05a579e28101d183557c9ae922cb8f94468589cfa9885ca91ee SHA512 5b38b1c8492b8c8a261ef0e89eddc531210dfcaf9158a32bae18ff1721f88ea91646a05a600fa5931bf53acedacebb26320a1ef136445c4b99ea011141222245
 EBUILD xfwm4-4.13.1-r1.ebuild 1897 BLAKE2B 28113547afdd5fc3671ba6414a05560a29050a1fdd21edcad7976b94dbd045dc2ec502d62db0fcefa960ad94603f0cf94716da0644fe8a936339f24ce0b074d2 SHA512 e9be0515a5cfcd81ce74cac2640f10b1bb34b57af7f709f5390e073d6e3b744de8664a0ae2ed58ef601d9ca3a2adab5985a7618dcd426a5f3d40ed83a7c94c2f
+EBUILD xfwm4-4.13.1-r2.ebuild 1945 BLAKE2B 0f035f0041217d7d3eae637a723872b65deb77ca015166bab9f03c4d7dc4e37896153ea4bb7358679335084bfe69365c2c41fd77343cd6397e9e68ca517f7568 SHA512 7f6889976c91d99710bbd5a3b0af1226d9dd7967114e32e0e5d53b589b3322821d3c939b890f13db1b2a561b99e9dec4cdc4f683a94746645d6a59d5e6dc4f19
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
new file mode 100644
index 000000000000..640e297ce92e
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.13.1-fix-mask-len.patch
@@ -0,0 +1,31 @@
+From 2080fa3c81b3810228ae5a8abbb494c78dd1d566 Mon Sep 17 00:00:00 2001
+From: Timo <timo.teras@iki.fi>
+Date: Thu, 13 Sep 2018 20:25:33 +0200
+Subject: device: Fix wrong mask len
+
+Bug: 14695
+
+The `mask_len` field is setup incorrectly in
+`xfwm_device_fill_xi2_event_mask()`.
+
+The size is the pointer length, not the bitmask data area length.
+---
+ src/device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/device.c b/src/device.c
+index b1e33ae2..01c0c81d 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -301,7 +301,7 @@ xfwm_device_fill_xi2_event_mask (XIEventMask *xievent_mask, gulong core_mask)
+     guint i;
+ 
+     xievent_mask->deviceid = XIAllMasterDevices;
+-    xievent_mask->mask_len = sizeof (mask);
++    xievent_mask->mask_len = len;
+     xievent_mask->mask = mask;
+ 
+     for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++)
+-- 
+cgit v1.2.1
+
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
new file mode 100644
index 000000000000..b929ce60b99d
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.13.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND="dev-libs/dbus-glib:=
+	>=dev-libs/glib-2.20:=
+	>=x11-libs/gtk+-3.20:3=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/pango:=
+	>=x11-libs/libwnck-3.14:3=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfconf-4.13:=
+	opengl? ( media-libs/libepoxy:=[X(+)] )
+	startup-notification? ( x11-libs/startup-notification:= )
+	xpresent? ( x11-libs/libXpresent )
+	xcomposite? (
+		x11-libs/libXcomposite:=
+		x11-libs/libXdamage:=
+		x11-libs/libXfixes:=
+		)"
+# libICE/libSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+PATCHES=(
+	# set of patches to fix refresh issues
+	# https://bugs.gentoo.org/614564
+	"${WORKDIR}/${P}-patchset"
+
+	"${FILESDIR}"/xfwm4-4.13.1-fix-mask-len.patch
+)
+
+src_configure() {
+	local myconf=(
+		$(use_enable opengl epoxy)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xpresent)
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 0f5c23a23014..3b0e5979c8dc 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index 07a7f60b4a8b..80e7a49884b1 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 BLAKE2B ec23b362627b8bbfdf7dae69aa3217dd902f175b1899ffa07bcbcd17a34acd68ccb5c0acab65fe88a892f5a2c4e6ca7f9f6cc5ed9526a77028679a31bded455b SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3
-EBUILD xfce4-notes-plugin-1.8.1-r1.ebuild 852 BLAKE2B c60abd343bfc366766dc5d7daaa91428ea50b19cdfd54e5f9680ae78e4fc35399fc9f40155abc05a187fccc6ff46a3d55c8edb8593d125d8a3351c3cd6a840a7 SHA512 a4e2e0e8778e4da166f6cd9021c97d69b1dde1bf052457b1cbede24d5c02554dd943dd4f63446de10be5d47ad769ad45cca4fa0a9dabd53eaefaae3b73680706
+EBUILD xfce4-notes-plugin-1.8.1-r1.ebuild 893 BLAKE2B 2e7f1e170f706b50f00adcde8798f5caf05cabf118e302c634c97b70888b78494141cd8cda6094c89dc93c0537aa2bd9d3ff435a2e947a8d6767e529ba931d68 SHA512 a7a4aee9cec0aec1730a468ee9d19bbc38fbddd98f0e0fe57a108130d11fccb020a5d04c97c372e7cab00c0d54ba2dbd9c4b6a656cc0a9aaf5b5ea7df3ec0aea
 EBUILD xfce4-notes-plugin-1.8.1.ebuild 821 BLAKE2B 3f6b0cf3541d488ededb646b5acb0f0e45586813669ca7b261105e38e91688b1f0b5c01e19dc5d126ab83a6a25eb967c2e0bd5230f0252858907e1c0639f2ba4 SHA512 53700d951945c799bc98e8108fca5dc3ed95d77084a6258afc013bdf640b23aad41af8e0c3165d95d7f382396e7d851edf9309eb27af55a0d63a5a2defcf1766
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
index b942e7c272ae..2d2897fe14b1 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
@@ -33,3 +33,7 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index 63d952d7614e..5ece4bf8ddd4 100644
--- a/xfce-extra/xfce4-time-out-plugin/Manifest
+++ b/xfce-extra/xfce4-time-out-plugin/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-time-out-plugin-1.0.2.tar.bz2 337382 BLAKE2B e98102dcb2531ee42950022e484ed57b307ebf9b4ea7adbff3508e75465b9ade24f90e9c800ff0daa8b0da59ffe84aac9fe802267327e9d361de4359b0b95eef SHA512 3f49664fc8fd947627e40de0338e3a115806045c97fa08fd678fdbb831947bcfe14c02e9961d671ce7546d4913fd9319322476df590a70458bdf86fa3bd43464
-EBUILD xfce4-time-out-plugin-1.0.2-r1.ebuild 812 BLAKE2B 60128a0b77d59e5aa139a17b3197e7c5386315fa3538117d8904acc1e93b67eef11a37744b5cddca9b1d9c93e0cce8a7fdd27c2ccb762e42987bb5c0c00108d2 SHA512 f54bd0bfad7092278489fca33ed497cb50f6f1e0c4d9a19a39280b80f1298c1675620e0c9db425ec25fc753b4a2a4f098a76b031d100888a8ab828824a0eecdb
+EBUILD xfce4-time-out-plugin-1.0.2-r1.ebuild 853 BLAKE2B 7306d5941f330db9d7fda996026babfa995bf35184a57f6f31b031a80465cf6b86c0efe2ebb335c7e06d5a930944dd431e94d5c017045e62652bdf64899427e4 SHA512 a4c86bfa5de19c299eddca0af7c7d97aabf83f7f665874a141c10baa94d483edb19208562bde6ce07857ff14c970e004aeb308174b6869630d7218a3482bce75
 EBUILD xfce4-time-out-plugin-1.0.2.ebuild 799 BLAKE2B a2c23f08ab7b4a5c5c8dfbf6b09624a3ee163a7a9446f324e6c08657f5bd2484f507df5cb1cec6b9f5b5bc42b9ab81a0fadacb51d0139613e61cba0f6706064b SHA512 47d1d8ca4897f4333d232f5a00ae8c8c769165406811bf758ac7b56a4f5230b7e4cbcc9862dcae6fd66f33f291cd304036e73568ab6aedd004797a4d167cee44
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
index 6bb08dc9c8cf..1b17740c0675 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
@@ -31,3 +31,7 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index b7f7beac156f..f03ae5962e06 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-windowck-plugin-0.2.4.tar.gz 75442 BLAKE2B 76f8ecd19435a47f608af2478b4754cb8a3257a0943099cc0368c3320d9158d426255f3b20002819b1275bbb81b28737f00a0f603bc783e677e7b96cf73de09e SHA512 43798a8714926eb03b2f92f8dd813572030965133b672bd07c485da77efef96114ed412dc7a5de730b2bc21da561ca34c44147147c75f266d8bc393f2550557c
 DIST xfce4-windowck-plugin-0.4.5.tar.gz 68762 BLAKE2B c4fdc900d16d668f06cc2c115c31df6d587ac7a833627b77145df4843497617a81acd508fbf5c54f9a443f4b2eaccf4ff86a445cbb83fbed068204c21f3354d2 SHA512 2750af17892e9083b0d359deb477688144b187b94dd0c8b50e4e88ed125631e7c6bf45a040cd036a9f09d1b8ce242a8d01a572eb9151258bb78c63e4744d367d
 EBUILD xfce4-windowck-plugin-0.2.4.ebuild 1027 BLAKE2B 2e0c8441eab39209959fb394e6b1b07be5820104a399c4bd0cbb6c87ece78bdd868466ab8b3ce4dfeeb4bef16780d3deaf19f9c0db74ba2ad7bb37b45d19cbf3 SHA512 e6d1dfb315259cab2d3b89566b50333232418d51f9ea34926308288915c1d79e536a7780b8fe96acfcff912ca37c69883f1a7906d3c09f9a695f692e4500a4c4
-EBUILD xfce4-windowck-plugin-0.4.5.ebuild 1096 BLAKE2B fbb02779b9f1c4ff8068e9cdec0ef6441e1824dd5261be867994c3065b58f472fe5c3b909a3255eb61ec8239a8e90d95df2af81fe99daeb98a9f3c1bd8f7590d SHA512 7d0337331d5b166153bee6b07bb20a0f22b2a943528002ce66168db6dbaebd77cc1cab1cca9044702b5b8dd412ae400e74f768e1c3e1982e37506c528271c4e2
+EBUILD xfce4-windowck-plugin-0.4.5.ebuild 1137 BLAKE2B ca1833e482bf24c48dee7510cd61dbb3fdde7e4d787daff95dc32f1950cde31e175a27cac2fec475c6ba1ce9beb42190075ff6276fb13335504c55d3b6bc6c93 SHA512 75a6c36f206975bbfd770559bd2a6768de1b2da801fae00f3959e5dfa03d6345bef7b1b6d1cc6dc52b6971b1277fb3aec1ac6175a5832c6a6807d2b34f79aa05
 MISC metadata.xml 344 BLAKE2B da3508bca7f277819a0903ab1680228f3f9142917f12ddef21086d5a41460b2da0ee494d012fe56414d957c0ccc0c08e323ad7da5009b37a1ebceedcb0b5656e SHA512 4b9ae50a2d6e8b5f3b1e35330c22e4ae5173ca6c5fab8e5d9182a7ca0de8fba3ee8c07c90933b28f4823063009b584e30c471bbbf88113c7cd13a44275aade20
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
index 4ab1395a85ea..393b44fd9670 100644
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.5.ebuild
@@ -41,3 +41,7 @@ src_prepare() {
 pkg_postinst() {
 	xdg_icon_cache_update
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 54601c7dcdf8..2a85b5713f3c 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -2,6 +2,6 @@ DIST xfdashboard-0.4.0.tar.bz2 2249568 BLAKE2B a11beea33f9230ad904b876a4ee44e513
 DIST xfdashboard-0.6.1.tar.bz2 2402318 BLAKE2B c45713ae63d69f55ff18606a2d865334cdf5ae4a853c1cb3027be368e3c803629e83c2363a9ffbf470391096b5c3bd22497ef35b0f7c41caa6357b4510b66bbc SHA512 3e68009ccbea71f22d7bb2d171f5f9331382a3128d32ea3ece976b31408bb4ff84cf8212efd268d655dba1396a5a9e01bb8449cd6f44d3e9c07b0c6841978897
 DIST xfdashboard-0.7.5.tar.bz2 3366413 BLAKE2B 4fb9c9bd298f5e9b0f3052e1f3d488386446d37e9130e750ee09756da856d232fdc4c18fc21e9883c3df46e7cba636c82f32942b17473a5710e30006baf6a54f SHA512 5d32aa3a49e02d85ca92bee6aa37a3b743e50ca5d992128decea5846e8c9008a9f5bdb98cc0ee3e980761a6538a4867ff28410e066ef22f0aa2c2bd4c5ce1523
 EBUILD xfdashboard-0.4.0.ebuild 891 BLAKE2B 750d8ca4487fece336449e011df9f4b62bdd0ee36680b893ba7800c91293e3334e106d3ccae26600c66a94ef587a1795843d23c2735ed9b5038aeb07ccacfb38 SHA512 49d7618b156a045ee8478bc262e9aa847478695237d768597508193a345cbaae1841f310068bd5e9ffa0d1ad9f2828b6950572a81bb5a020b2f0aab3ad5aa916
-EBUILD xfdashboard-0.6.1.ebuild 945 BLAKE2B f5dfa7872ffb0b731d76c61ee986e5990fb137afa3de81cf228f79e0ec4d6032e7eca8dffd9249dd72e179a3fc5b3833670763c927fa3749c3036ad8b44c1640 SHA512 a2b12fcc16cb463f2c4ccd7a0ac4c5f9bc8a8b2cb4306fa1a6d0fcbce4839111f8e57db2b088a6f8945201b68d7f755573f316ba8b22c4e768e6b09be6f219e5
-EBUILD xfdashboard-0.7.5.ebuild 920 BLAKE2B bca5e0a7d7441ccfec53459ecb4fe4a274e3e7d8abd321fcac128cee698417564d302c70964b173885cd79517fd55786c0107e31ee661304a0baef78977a05f1 SHA512 20744b57f9f1a75e1422250867ac09f2069570c070d6ec576033fa9f9c2c1ca5cead87f72350227a8e8a113b47a4f950ae540a29fe77b64b0fd06f603f47b976
+EBUILD xfdashboard-0.6.1.ebuild 986 BLAKE2B a5bac02bf268b807abdf385fc9e8c784b0eb57420c5a6acc81d3597b854247227a6945a21564f73dace629d972dacd9f7c0ff27ea8a829ed60b3b2db848aa901 SHA512 0768dd58952a203d3e871742b4ebd391e6dc154e48912e54b1f4e5895ca63dbdd164a6b7c9982b20bce90e5485595c4249dbf6f233f7784a43ddfb850ca12231
+EBUILD xfdashboard-0.7.5.ebuild 961 BLAKE2B 3ed840ddfe54fb200bddad1cd305161452b7345155a62161b042dfff29be430c64335391def9e86b3a6a1d746e39d2ecf2e7ed0967380260a81c67d31e508199 SHA512 7c1870bcd1d07086663f0241083e1f4407d367003cab944400388278eff84c6f50e411cb3be67072487b71a9f6552d2d2cda8c167402a5a5eb1c22b1ae8aa222
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
index 853578156a6f..d902d6643284 100644
--- a/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
+++ b/xfce-extra/xfdashboard/xfdashboard-0.6.1.ebuild
@@ -39,3 +39,7 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
index 8639f9ddf744..fb15a154f978 100644
--- a/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
+++ b/xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
@@ -38,3 +38,7 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}